第三次提交

build-profile.json5

@@ -5,13 +5,13 @@
         "name": "default",
         "type": "HarmonyOS",
         "material": {
-          "certpath": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_80086000143711705.cer",
-          "storePassword": "0000001A9E07D559431AC452C0A963C3436574654FFAAC393DA1E705ADB1A945CCF72F93D4DBE9A5A863",
+          "certpath": "C:\\Users\\6\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_2850086000417214609.cer",
+          "storePassword": "0000001BCCC19140423F20A0B0F953562A615491EB521DA23FFBA6A9B929BD546E321E4DC0B70CBC1CB848",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001A850680193913A61A89FA25BE1274A097179A0813D22ADD76497AA9DB8448C8A4226E37166B9B",
-          "profile": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_80086000143711705.p7b",
+          "keyPassword": "0000001B626241D0A45ABABB7EDE8C6D9B63689AF5298D37C13499D5F25B0009C3BDC4ABC2B2E387B996D4",
+          "profile": "C:\\Users\\6\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_2850086000417214609.p7b",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_80086000143711705.p12"
+          "storeFile": "C:\\Users\\6\\.ohos\\config\\auto_debug_WonderfulDemo_com.example.wonderfulDemo_2850086000417214609.p12"
         }
       }
     ],

entry/src/main/ets/common/component/TaskComp.ets

@@ -83,6 +83,7 @@ export struct TaskComp {
 
         }.width('100%')
         .height('50%')
+        .margin({right:5})
         Divider().vertical(false)
           .width('80%')
         Blank()
@@ -113,6 +114,7 @@ export struct TaskComp {
 
         }.width('100%')
         .height('50%')
+        .margin(5)
 
 
       }.width('30%')
@@ -142,9 +144,7 @@ export struct TaskComp {
               .fontWeight(FontWeight.Regular)
 
             Blank()
-
           }.width('100%')
-
           .height('30%')
           Text(this.completeNum.toString()).width('80%')
             .height('70%')
@@ -155,6 +155,7 @@ export struct TaskComp {
 
         }.width('100%')
         .height('50%')
+        .margin({right:5})
         .onClick(()=>{
           router.pushUrl({
             url:'pages/process/ProcessHome'
@@ -178,9 +179,8 @@ export struct TaskComp {
             Blank()
 
           }.width('100%')
-
           .height('30%')
-          Text(this.bugNum.toString()).width('80%')
+          Text(this.bugNum.toString()).width('100%')
             .height('60%')
             .fontColor('#e6000000')
             .textAlign(TextAlign.Center)
@@ -192,6 +192,10 @@ export struct TaskComp {
         .backgroundColor('#ffff')
         .borderRadius(px2vp(21))
         .margin(5)
+        .onClick(()=>{
+
+
+        })
 
 
       }.width('30%')

entry/src/main/ets/pages/Index.ets

@@ -236,6 +236,7 @@ struct Index {
                 TaskComp({isHomePage: this.isHomePage})
                 Text('生产操作')
                   .fontSize(px2vp(27))
+                  .margin({top:5})
                   .fontWeight(FontWeight.Medium)
                   .fontColor($r('app.color.robot_set_card_white'))
             }
@@ -245,6 +246,7 @@ struct Index {
            Column(){
               Warehousing()
              Text('智能仓储')
+               .margin({top:5})
                .fontSize(px2vp(27))
                .fontWeight(FontWeight.Medium)
                .fontColor($r('app.color.robot_set_card_white'))
@@ -252,9 +254,15 @@ struct Index {
             .height('40%')
             .width('32%')
             .margin({left:10})
+            .onClick(()=>{
+              router.pushUrl({
+                url:'pages/Storage'
+              })
+            })
             Column(){
               SmartFactoryCard()
               Text('智汇工厂')
+                .margin({top:5})
                 .fontSize(px2vp(27))
                 .fontWeight(FontWeight.Medium)
                 .fontColor($r('app.color.robot_set_card_white'))
@@ -262,19 +270,18 @@ struct Index {
             .height('40%')
             .width('32%')
             .margin({left:10})
-
+            .onClick(()=>{
+              router.pushUrl({
+                url:'pages/SmartFactory'
+              })
+            })
           }
           .width('100%')
           .height('100%')
-
-
-
-
         }
         .justifyContent(FlexAlign.Center)
         .width('100%')
         .height('68%')
-
         Row({ space: 10 }) {
           Text().width('1%')
           Column({ space: 10 }) {
@@ -287,7 +294,6 @@ struct Index {
               .textAlign(TextAlign.Center)
               .fontSize(16)
               .fontColor('#ffff')
-
           }
           .width('10%')
           .justifyContent(FlexAlign.Center)
@@ -300,8 +306,6 @@ struct Index {
               url: 'pages/SetPage'
             })
           })
-
-
           Column({ space: 10 }) {
             Image($r('app.media.cangchu'))
               .width('60%')
@@ -323,8 +327,6 @@ struct Index {
               url: 'pages/Storage'
             })
           })
-
-
           Column({ space: 10 }) {
             Image($r('app.media.jiqiren'))
               .width('60%')

entry/src/main/ets/pages/Storage.ets

@@ -7,7 +7,106 @@ import {testGet1,StorageStatus,testPost} from '../common/util/request/testR'
 import {OtherStorageOutbound}from '../view/OtherStorageOutbound'
 import {OtherWarehousing}from '../view/OtherWarehousing'
 import { OtherStatistics } from '../view/OtherStatistics';
-
+export interface ScanStorageclass {
+  //批次号
+  //已经占用箱数
+  useNum?:number
+  //空箱数
+  emptyBoxNum?:string
+  //可用箱数
+  canUsedNum?:string
+  //总容量箱数
+  allNum?:number
+  //仓储类型
+  type?:string
+  //批次号
+  coordinate?: string
+  //创建时间
+  created?: string
+  //
+  creator?: string
+  //仓库编码
+  houseNo?:string
+  deptId?: string
+  houseType?:string
+  //主键
+  id?:string
+  locationNo?: string
+  //	物料名称
+  materialName?:string
+  //物料编码
+  materialNo?: string
+  //出入库数量
+  num?: number
+  orgId?: string
+  planNo?: string
+  position?: string
+  //	序列号
+  seqNo?: string
+  // 状态；1-待处理；2-处理中；3-处理异常；4-已完成
+  state?:string
+  //	库存数量
+  stockNum?:string
+  //出入库任务单号
+  taskNo?: string
+  unit?:string
+  updated?: string
+  //任务名称
+  taskName?:string
+  updator?: string
+  vehicleNo?: string
+  batchCode?:string
+}
+export interface ScanStoragecodeclass {
+  //批次号
+  //已经占用箱数
+  useNum?:number
+  //空箱数
+  emptyBoxNum?:string
+  //可用箱数
+  canUsedNum?:string
+  //总容量箱数
+  allNum?:number
+  //仓储类型
+  type?:string
+  //批次号
+  coordinate?: string
+  //创建时间
+  created?: string
+  //
+  creator?: string
+  //仓库编码
+  houseNo?:string
+  deptId?: string
+  houseType?:string
+  //主键
+  id?:string
+  locationNo?: string
+  //	物料名称
+  materialName?:string
+  //物料编码
+  materialNo?: string
+  //出入库数量
+  num?: number
+  orgId?: string
+  planNo?: string
+  position?: string
+  //	序列号
+  seqNo?: string
+  // 状态；1-待处理；2-处理中；3-处理异常；4-已完成
+  state?:string
+  //	库存数量
+  stockNum?:string
+  //出入库任务单号
+  taskNo?: string
+  unit?:string
+  updated?: string
+  //任务名称
+  taskName?:string
+  updator?: string
+  vehicleNo?: string
+  batchCode?:string
+}
 @Entry
 @Component
 struct Storage {
@@ -19,6 +118,8 @@ struct Storage {
   @State CunQuHuo:number=0
   @State ChuRukun:number=0
   @State ZhuangTai:number=0
+  @State private ScanStoragecodelist:Array<ScanStoragecodeclass>=[]
+  @State private ScanStoragelist:Array<ScanStorageclass>=[]
   private isHomePage:boolean = false
   build() {
     Row() {
@@ -256,10 +357,10 @@ struct Storage {
             //仓储3D位置
             if (this.ChuRukun===0&&this.CangKu===0){
               /////出库
-              IntelligentWarehousingOutbound()
+              IntelligentWarehousingOutbound({ScanStoragelist:this.ScanStoragelist})
             }else if (this.ChuRukun===1&&this.CangKu===0){
               ///入库
-              IntelligentStorageWarehousing()
+              IntelligentStorageWarehousing({ScanStoragelist:this.ScanStoragecodelist})
             }else if (this.ChuRukun===2&&this.CangKu===0){
               ///智能仓储统计
               Statistics()

entry/src/main/ets/view/IntelligentStorageWarehousing.ets

@@ -3,7 +3,7 @@
 import {Warehousing,BufferHopper, WarehousingBufferHopperList,BufferHopperclass}from '../common/util/request/testR'
 import { ScanTheStorageCode }from '../view/ScanTheStorageCode'
 
-export interface ScanStorageclass {
+export interface ScanStoragecodeclass {
   //批次号
   //已经占用箱数
   useNum?:number
@@ -56,7 +56,7 @@ export interface ScanStorageclass {
 @CustomDialog
   ///入库确认弹框
 struct bufferf {
-   @Link private ScanStoragelist:Array<ScanStorageclass>
+   @Link private ScanStoragecodelist:Array<ScanStoragecodeclass>
   @Link CunQuHuo:number
   scroller: Scroller = new Scroller()
   @State navigation:number=0
@@ -82,7 +82,7 @@ struct bufferf {
           .fontColor('#99000000')
         Column(){
           Grid(this.scroller) {
-            ForEach(this.ScanStoragelist, (item:ScanStorageclass) => {
+            ForEach(this.ScanStoragecodelist, (item:ScanStoragecodeclass) => {
               //    ForEach(this.Number, (day: string) => {
               GridItem() {
                 Row(){
@@ -327,10 +327,11 @@ struct ChuKU {
       .scale({x:0,y:0,z:0})
   }
 }
-@Entry
+
 @Component
 export struct IntelligentStorageWarehousing{
-  @State private ScanStoragelist:Array<ScanStorageclass>=[]
+ // @State private ScanStoragecodelist:Array<ScanStoragecodeclass>=[]
+  @Link private ScanStoragelist:Array<ScanStoragecodeclass>
   @State previewUri: Resource = $r('app.media.morentu')
   @State videoSrc: Resource = $rawfile('quliao.mp4')
   @State CunQuHuo:number=0
@@ -351,7 +352,7 @@ export struct IntelligentStorageWarehousing{
   }
   WarehousingbufferhopperController: CustomDialogController = new CustomDialogController({
     builder:bufferf({
-      ScanStoragelist:this.ScanStoragelist,
+      ScanStoragecodelist:this.ScanStoragelist,
       CunQuHuo:this.CunQuHuo,
       cancel: this.onCancel,
       confirm: this.onAccept,

entry/src/main/ets/view/IntelligentWarehousingOutbound.ets

@@ -1,7 +1,4 @@
 import {Workbin} from '../common/component/Workbin'
-// import {OutboundScanCode} from '../common/compont/OutboundScanCode'
-// import {OutboundList}from '../common/compont/OutboundList'
-import {Tasklistoutbound,Tasklist} from  '../common/util/request/testR'
 export interface ScanStorageclass {
   //批次号
   //已经占用箱数
@@ -302,15 +299,15 @@ struct Outbound {
     // dialog默认的borderRadius为24vp，如果需要使用border属性，请和borderRadius属性一起使用。
   }
 }
-@Entry
+//@Entry
 @Component
 export struct IntelligentWarehousingOutbound{
-  @State private ScanStoragelist:Array<ScanStorageclass>=[]
+ // @State private ScanStoragelist:Array<ScanStorageclass>=[]
+  @Link private  ScanStoragelist:Array<ScanStorageclass>
   @State previewUri: Resource = $r('app.media.morentu')
   @State videoSrc: Resource = $rawfile('lailaoship.mp4')
   @State textValue: string = ''
   @State inputValue: string = ''
-
   @State ZhuangTai:number=0
   @State CunQuHuo:number=0
   OutboundController: CustomDialogController = new CustomDialogController({

entry/src/main/ets/view/ScanTheStorageCode.ets

@@ -1,5 +1,5 @@
 import StorageRequest from '../common/util/request/StorageIndex';
-import {ScanStorageclass}from './IntelligentStorageWarehousing'
+import {ScanStoragecodeclass}from './IntelligentStorageWarehousing'
 class Item{
   name:string
   id:string
@@ -16,7 +16,7 @@ class Item{
   ///无批次号物料详情弹窗
 struct Outbound {
   @Link value:number
-  @State private items:Array<ScanStorageclass>=[]
+  @State private items:Array<ScanStoragecodeclass>=[]
   @Link CunQuHuo:number
   scroller: Scroller = new Scroller()
   @State navigation:number=0
@@ -307,8 +307,8 @@ struct buffer {
   @State num:number=0
   @State materialName:string=''
   @State itemCode:string='132451234'
-  ScanStorageCode= async(itemCode:string) : Promise<ScanStorageclass> => {
-    let obj: ScanStorageclass
+  ScanStorageCode= async(itemCode:string) : Promise<ScanStoragecodeclass> => {
+    let obj: ScanStoragecodeclass
     let res = await StorageRequest.get("/api/v3/common/scanItem/"+itemCode)
     //let res = await StorageRequest.get("/api/v3/stock/selectSafeList/1")
     console.log('testTag', '扫码成功1！' + JSON.stringify(res))
@@ -329,7 +329,7 @@ struct buffer {
   //   //  console.log("扫码成功4!"+JSON.stringify(this.ScanStoragelist))
   // }
   @State click:number=-1
-  @Link private ScanStoragelist:Array<ScanStorageclass>
+  @Link private ScanStoragelist:Array<ScanStoragecodeclass>
   @Link CunQuHuo:number
   scroller: Scroller = new Scroller()
   @State navigation:number=0
@@ -363,7 +363,7 @@ struct buffer {
               .backgroundColor("#ffff")
               .borderRadius(21)
               .onSubmit(() => {
-                this.ScanStorageCode(this.itemCode).then((obj : ScanStorageclass)=>{
+                this.ScanStorageCode(this.itemCode).then((obj : ScanStoragecodeclass)=>{
                   this.ScanStoragelist.push(obj)
                 })
               })
@@ -383,7 +383,7 @@ struct buffer {
         Column(){
           Grid(this.scroller) {
             if (this.ScanStoragelist && this.ScanStoragelist.length > 0) {
-              ForEach(this.ScanStoragelist, (item:ScanStorageclass,index:number) => {
+              ForEach(this.ScanStoragelist, (item:ScanStoragecodeclass,index:number) => {
                 GridItem() {
                   Row(){
                     Column({space:10}){
@@ -564,7 +564,7 @@ export struct ScanTheStorageCode{
     gridCount: 4,
     customStyle: true,
   })
-  @Link private ScanStoragelist:Array<ScanStorageclass>
+  @Link private ScanStoragelist:Array<ScanStoragecodeclass>
   scroller: Scroller = new Scroller()
   MaterialRetrievalController: CustomDialogController = new CustomDialogController({
     builder: buffer({
@@ -613,7 +613,7 @@ export struct ScanTheStorageCode{
       ///入库列表
       Column({ space: 5 }) {
         Grid(this.scroller) {
-          ForEach(this.ScanStoragelist, (item:ScanStorageclass) => {
+          ForEach(this.ScanStoragelist, (item:ScanStoragecodeclass) => {
             //    ForEach(this.Number, (day: string) => {
             GridItem() {
               Row(){

entry/src/main/ets/view/processview/MaterialCollectView.ets

@@ -200,9 +200,6 @@ export struct MaterialCollectView {
           Image($r('app.media.scan_qr'))
             .width($r('app.float.material_collect_image_size'))
             .height($r('app.float.material_collect_image_size'))
-            .borderStyle(BorderStyle.Dashed)
-            .borderColor($r('app.color.material_collect_border_color'))
-            .borderWidth(1)
           Text('扫描物料编码添加物料')
             .fontSize($r('app.float.card_info_font_size'))
             .fontColor($r('app.color.general_font_color'))