소스 검색

修改inboundview入库

cjb 3 주 전
부모
커밋
fe469194fb

+ 0 - 3
entry/src/main/ets/common/util/mqtt.ets

@@ -64,7 +64,6 @@ class MqttManager {
     // 触发回调
     const topicCallbacks = this.callbacks.get(topic) || [];
     topicCallbacks.forEach(cb => cb(topic, payload));
-    console.info("sssssss"+payload)
     try {
       const valueJson: MQTTReceiveData = JSON.parse(payload);
       const station2Set = valueJson?.d?.find(item => item.tag === 'Station2Set')?.value;
@@ -83,7 +82,6 @@ class MqttManager {
         valueJson?.d?.find(item => item.tag === 'RFID2Data3')?.value as number,
         valueJson?.d?.find(item => item.tag === 'RFID2Data4')?.value as number
       );
-      console.info(TAG,`抽屉内${rfidStringIn}:抽屉外${rfidStringOut}`)
       AppStorage.SetOrCreate<number>('drawerPositionStatus', station2Set);
       AppStorage.SetOrCreate<number>('materialBoxWeight', station2Weight);
       AppStorage.SetOrCreate<string>('materialBoxID', rfidStringIn);
@@ -199,7 +197,6 @@ export interface MQTTReceiveData {
 
 
 function decodeRegister(regValue: number | undefined): string {
-  console.info("regvalue"+String(regValue))
   if (regValue === undefined) return ''; // 处理undefined
 
   // 确保是16位无符号整数

+ 3 - 2
entry/src/main/ets/component/InBoundView.ets

@@ -25,7 +25,7 @@ export struct InBoundView {
   //入库按钮缩放
   @State InboundButtonClick :number = 1
   //入库料箱物料表
-  @Prop private boxMaterials: Array<MaterialBoxInfo> = []
+  @Link private boxMaterials: Array<MaterialBoxInfo>
   //弹窗提示内容
   @State reminds:string = ''
   //全局变量 料箱重量
@@ -279,7 +279,8 @@ export struct InBoundView {
         setTimeout(() => {
           this.InboundButtonClick = 1; // 0.2秒后恢复
         }, 200);
-
+        console.info('sssss'+JSON.stringify(this.boxMaterials))
+        return
         if(this.drawerPositionStatus == 0)
         {
           this.reminds = "抽屉未缩回,请检查后重试"

+ 6 - 1
entry/src/main/ets/pages/EmptyBoxStorage.ets

@@ -5,6 +5,7 @@ import {NavigationBar} from '../component/NavigationBar'
 import {TimeAndTitle} from "../component/TimeAndTitle"
 import {InBoundView} from '../component/InBoundView'
 import router from '@ohos.router';
+import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 @Entry
 @Component
 struct emptyBoxStorage {
@@ -16,6 +17,7 @@ struct emptyBoxStorage {
   @State printButtonClick :number = 1
   @State writeButtonClick :number = 1
   @State materialNum: number=0
+  @State ScanMaterialList:WorkOrderInfo[] = []
   build() {
     Row() {
       Column() {
@@ -242,7 +244,10 @@ struct emptyBoxStorage {
             .fillColor($r('app.color.FFFFFF'))
             .margin({left:'-2%',right:'-2%'})
           Column(){
-            InBoundView({materialNum:this.materialNum});
+            InBoundView({
+              materialNum:this.materialNum,
+              boxMaterials:this.ScanMaterialList
+            })
           }
           .width('29%')
           .height('85%')

+ 5 - 1
entry/src/main/ets/pages/LittleMaterialOutBound.ets

@@ -25,6 +25,7 @@ struct LittleMaterialsOutBound {
   @State currentStep: number = 1;
   @State nextStepButtonClick :number = 1
   @State preStepButtonClick :number = 1
+  @State ScanMaterialList:WorkOrderInfo[] = []
   @State outBoundButtonClick :number = 1
   @State materialData: WorkOrderMaterialInfo[] = [];
   @State emptyBoxes: EmptyBox[] = [
@@ -412,7 +413,10 @@ struct LittleMaterialsOutBound {
           Column() {
             Row() {
               Column() {
-                InBoundView({ materialNum: this.materialNum })
+                InBoundView({
+                  materialNum:this.materialNum,
+                  boxMaterials:this.ScanMaterialList
+                })
               }.width('29%').backgroundColor($r('app.color.10FFFFFF'))
               Image($r('app.media.arrow_right'))
                 .width($r('app.float.virtualSize_23'))

+ 5 - 1
entry/src/main/ets/view/wms/OperationMaterialKitThreeStep.ets

@@ -10,12 +10,16 @@ export struct OperationMaterialKitThreeStep {
   @Link selectOperations: OperationInfo[]
   @Link operationItems: OperationItem[]
   @State materialNum: number = 0
+  @State ScanMaterialList:WorkOrderInfo[] = []
 
   build() {
     Row() {
       // 出入库料口操作
       Column() {
-        InBoundView({materialNum:this.materialNum});
+        InBoundView({
+          materialNum:this.materialNum,
+          boxMaterials:this.ScanMaterialList
+        });
       }
       .height('100%')
       .width('29.6%')

+ 5 - 1
entry/src/main/ets/view/wms/OperationMaterialKitTwoStep.ets

@@ -19,6 +19,7 @@ export struct OperationMaterialKitTwoStep {
   @Link workOrder: WorkOrderInfo
   @Link selectOperations: OperationInfo[]
   @Link operationItems: OperationItem[]
+  @State ScanMaterialList:WorkOrderInfo[] = []
   selectOperationIds: string[] = []
   // 每个工序需要的物料编码分组
   operationItemCodes: HashMap<string, string[]> = new HashMap<string, string[]>()
@@ -294,7 +295,10 @@ export struct OperationMaterialKitTwoStep {
         .width($r('app.float.virtualSize_19_2'))
       // 出入库料口操作
       Column() {
-        InBoundView({materialNum:this.materialNum});
+        InBoundView({
+          materialNum:this.materialNum,
+          boxMaterials:this.ScanMaterialList
+        })
       }
       .height('100%')
       .width('29.6%')