Forráskód Böngészése

智能仓储出库修改

yixiaojun 1 éve
szülő
commit
2e2deb2899

+ 184 - 0
entry/src/main/ets/common/component/OutboundTask.ets

@@ -0,0 +1,184 @@
+import StorageRequest from '../util/request/StorageRequest';
+export interface  Tasklist {
+
+  //批次号
+  batchCode?: string;
+  ///完成数量
+  completedNum?:number
+
+  //已经占用箱数
+  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
+  relPlanNo?:string
+  relOrderNo?:string
+  relOutOrderNo?:string
+  progress?:string
+  planNo?: string
+  position?: string
+  //	序列号
+  seqNo?: string
+  // 状态;1-待处理;2-处理中;3-处理异常;4-已完成
+  state?:number
+  //	库存数量
+  stockNum?:string
+  //出入库任务单号
+  taskNo?: string
+  unit?:string
+  updated?: string
+  //任务名称
+  taskName?:string
+  updator?: string
+  vehicleNo?: string
+
+}
+@Entry
+@Component
+export struct OutboundTask{
+  @State SelectableMarker:number=0
+  scroller: Scroller = new Scroller()
+  @State taskNo:string=''
+  @State private TasklistoutboundData:Array<Tasklist>=[]
+  Tasklistoutbound = async() : Promise<Tasklist[]> => {
+    let obj: Tasklist[] = []
+    let res = await StorageRequest.post("/api/v3/task/list", {
+      type: 2
+    })
+    console.log('testTag', 'Tasklist成功' + JSON.stringify(res))
+    obj = JSON.parse(JSON.stringify(res))
+    console.log('testTag', 'aaaaaaaa' +JSON.stringify(obj));
+    return obj
+  }
+  aboutToAppear(){
+    this.Tasklistoutbound().then((res : Tasklist[]) => {
+      console.log('testTag', 'result cccccc'+JSON.stringify(res))
+      if (res && res.length > 0) {
+        this.TasklistoutboundData = res
+        this.taskNo=this.TasklistoutboundData[0].taskNo
+      }
+    })
+  }
+build(){
+  Column(){
+    Grid(this.scroller) {
+      ForEach(this.TasklistoutboundData, (item:Tasklist ,index:number) => {
+        GridItem() {
+          Row(){
+            Column(){
+              Text(item.taskName)
+                .fontSize('32px')
+                .width('100%')
+                .height('20%')
+              Row(){
+                Column(){
+                  Text('产品型号:'+item.taskNo)
+                    .fontSize($r('app.float.robot_state_font_size'))
+                    .textAlign(TextAlign.Start)
+                    .fontColor('#99000000')
+                    .width('100%')
+                    .height('20%')
+                  Text('计划编号:'+item.relPlanNo)
+                    .fontSize($r('app.float.robot_state_font_size'))
+                    .textAlign(TextAlign.Start)
+                    .fontColor('#99000000')
+                    .width('100%')
+                    .height('20%')
+                  Text('订单编号:'+item.relOrderNo)
+                    .fontSize($r('app.float.robot_state_font_size'))
+                    .textAlign(TextAlign.Start)
+                    .fontColor('#99000000')
+                    .width('100%')
+                    .height('20%')
+                  Text('出库单号:'+item.relOutOrderNo)
+                    .fontSize($r('app.float.robot_state_font_size'))
+                    .textAlign(TextAlign.Start)
+                    .fontColor('#99000000')
+                    .width('100%')
+                    .height('20%')
+                  Row(){
+                    Text('取料进度:'+item.progress)
+                      .fontSize($r('app.float.robot_state_font_size'))
+                      .textAlign(TextAlign.Start)
+                      .fontColor('#99000000')
+                      .width('50%')
+                      .height('100%')
+                    Text(item.updated)
+                      .fontSize($r('app.float.robot_state_font_size'))
+                      .textAlign(TextAlign.End)
+                      .fontColor('#99000000')
+                      .width('50%')
+                      .height('100%')
+                  }.width('100%')
+                  .height('20%')
+
+
+                }
+                .justifyContent(FlexAlign.Center)
+                .width('100%')
+                .height('100%')
+              } .width('100%')
+              .height('80%')
+            }.width('100%')
+            .padding({left:20,right:20})
+            .borderRadius(10)
+            .alignItems(HorizontalAlign.Start)
+            .justifyContent(FlexAlign.Center)
+            .height('100%')
+            .onClick(()=>{
+              this.SelectableMarker=index
+              this.taskNo=item.taskNo
+
+            })
+          }
+          .padding(10)
+          .borderRadius(10)
+          .height('30%')
+          .backgroundColor(this.SelectableMarker===index?
+          $r('app.color.robot_set_card_blue'):$r('app.color.robot_set_card_white'))
+
+        }
+        .onClick(()=>{
+          this.SelectableMarker=index
+        })
+      })
+    }
+    .padding(10)
+    .columnsTemplate('1fr')
+    .columnsGap(10)
+    .rowsGap(10)
+    .onScrollIndex((first: number) => {
+      console.info(first.toString())
+    })
+    .width('100%')
+    .height('100%')
+  }.width('100%')
+  .height('100%')
+}
+}

+ 36 - 35
entry/src/main/ets/pages/Index.ets

@@ -91,48 +91,49 @@ struct confirmPopup {
             .fontWeight(FontWeight.Medium)
             .fontSize(px2vp(38))
             .textAlign(TextAlign.Start)
-            .onClick(async ()=>{
-              // 第一种遍历, const后面的是变量,变量的值就是数组的元素
-              // for (const card of this.cardServices) {
-              //
-              //   card.cardStatus
-              // }
 
-              // 第二种遍历,index是数组索引
-              // 1.修改变量数组中,此卡片类型的对象(改为打开状态)
-              let temp: UniversalCard
-              let deleteIndex: number
-              for (let index=0; index < this.cardServices.length; index++) {
-                if (this.cardServices[index].cardType === this.cardType) {
-                  this.cardServices[index].cardStatus = 1
-                  temp = this.cardServices[index]
-                  deleteIndex = index
-                  break
-                }
-              }
-              // 2.删除变量数组中
-              this.cardServices.splice(deleteIndex, 1)
-              // 3.修改排序号
-              let sort: number = 0
-              for (let index=0; index < this.cardServices.length; index++) {
-                this.cardServices[index].cardSort = sort
-                // 4.更新数据库数据
-                await UniversalCardModel.updateUniversalCard(this.cardServices[index])
-                sort++
-              }
-              // 5.变量数组添加元素
-              temp.cardSort = this.cardServices.length
-              this.cardServices.push(temp)
-              // 6.修改数据入库
-              await UniversalCardModel.updateUniversalCard(temp)
-              this.controller.close()
-            })
 
         }.width('100%')
         .height('80%')
         .padding({left:10})
         .borderRadius(px2vp(15))
         .backgroundColor($r('app.color.general_font_white_color'))
+        .onClick(async ()=>{
+          // 第一种遍历, const后面的是变量,变量的值就是数组的元素
+          // for (const card of this.cardServices) {
+          //
+          //   card.cardStatus
+          // }
+
+          // 第二种遍历,index是数组索引
+          // 1.修改变量数组中,此卡片类型的对象(改为打开状态)
+          let temp: UniversalCard
+          let deleteIndex: number
+          for (let index=0; index < this.cardServices.length; index++) {
+            if (this.cardServices[index].cardType === this.cardType) {
+              this.cardServices[index].cardStatus = 1
+              temp = this.cardServices[index]
+              deleteIndex = index
+              break
+            }
+          }
+          // 2.删除变量数组中
+          this.cardServices.splice(deleteIndex, 1)
+          // 3.修改排序号
+          let sort: number = 0
+          for (let index=0; index < this.cardServices.length; index++) {
+            this.cardServices[index].cardSort = sort
+            // 4.更新数据库数据
+            await UniversalCardModel.updateUniversalCard(this.cardServices[index])
+            sort++
+          }
+          // 5.变量数组添加元素
+          temp.cardSort = this.cardServices.length
+          this.cardServices.push(temp)
+          // 6.修改数据入库
+          await UniversalCardModel.updateUniversalCard(temp)
+          this.controller.close()
+        })
         Divider()
           .width('80%')
 

+ 2 - 9
entry/src/main/ets/pages/Storage.ets

@@ -130,7 +130,6 @@ struct Storage {
 
           Row(){
             Row({space:10}){
-              Text().width('1%')
               Stack(){
                 Row(){
 
@@ -196,21 +195,15 @@ struct Storage {
                   .height('100%')
                   .borderRadius(15)
                 }
-              }.width('29%')
+              }.width('30%')
               .height('80%')
               .borderRadius(15)
               .backgroundColor('#1a000000')
-
-
-
-
-
+              .margin({left:10})
           }
-
             Blank()
             Stack(){
               Row(){
-
               }.width('100%')
               .height('100%')
               .backgroundColor('#1a000000')

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 807 - 1246
entry/src/main/ets/view/IntelligentWarehousingOutbound.ets


+ 2 - 7
entry/src/main/ets/view/ScanTheOutboundQRCode.ets

@@ -402,13 +402,8 @@ export struct ScanTheOutboundQRCode{
         .onClick(()=>{
           this.MaterialRetrievalController.open()
         })
-        Blank()
-        Row(){
-          Text('已选LX2347598')
-        }
-        .width('48%')
-        .height('100%')
-      }.width('96%')
+
+      }.width('95%')
       .height('8%')
       .borderRadius(15)
       ///出库列表

BIN
entry/src/main/resources/base/media/arrow_left_bottom.png


BIN
entry/src/main/resources/base/media/arrow_left_top.png


BIN
entry/src/main/resources/base/media/arrow_right_bottom.png


BIN
entry/src/main/resources/base/media/arrow_right_top.png


entry/src/main/resources/base/media/lanseanniul.svg → entry/src/main/resources/base/media/blue_button_left.svg


entry/src/main/resources/base/media/lanseanniuR.svg → entry/src/main/resources/base/media/blue_button_right.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 4 - 0
entry/src/main/resources/base/media/circular_return.svg


BIN
entry/src/main/resources/base/media/collect_completed.png


entry/src/main/resources/base/media/huiseanniul.svg → entry/src/main/resources/base/media/gray_button_left.svg


entry/src/main/resources/base/media/huiseanniuR.svg → entry/src/main/resources/base/media/gray_button_right.svg


BIN
entry/src/main/resources/base/media/material_box_center_off.png


BIN
entry/src/main/resources/base/media/material_box_center_on.png


BIN
entry/src/main/resources/base/media/material_box_left_bottom.png


BIN
entry/src/main/resources/base/media/material_box_left_top.png


BIN
entry/src/main/resources/base/media/material_box_right_bottom.png


BIN
entry/src/main/resources/base/media/material_box_right_top.png