统一参数

entry/src/main/ets/component/InBoundView.ets

@@ -6,12 +6,13 @@ import {MQTTPublishData} from '../common/util/mqtt';
 import promptAction from '@ohos.promptAction';
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import CommonConstants from '../common/constants/CommonConstants'
-import {MaterialBoxInfo} from '../params/MaterialInformationParam'
 import {RemindDialog} from "../component/OrderMaterialsStorageView"
 import WmsRequest from '../common/util/request/WmsRequest'
 import {detailsListClass} from '../viewmodel/wms/InBoundOrderInfo'
 import {CommonConfirmDialog}from "../component/OrderMaterialsStorageView"
 import {ConfirmDialogParams} from "../params/OrderMaterialsStorageParams"
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
+
 @Component
 export struct InBoundView {
   //右下角抽屉日志

entry/src/main/ets/component/OrderMaterialsStorageView.ets

@@ -1,9 +1,10 @@
 import {DemandMaterial,OrderParams,MaterialItem,MaterialBox,EmptyBox} from "../params/OrderMaterialsStorageParams"
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
-import {MaterialBoxInfo} from '../params/MaterialInformationParam'
 import WmsRequest from '../common/util/request/WmsRequest'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo'
+
 @Component
 export struct ProcessFlow {
   @Prop currentStep: number =0

entry/src/main/ets/pages/LittleMaterialOutBound.ets

@@ -18,7 +18,7 @@ import WmsRequest from '../common/util/request/WmsRequest'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
-import HouseStock from '../viewmodel/wms/HouseStock';
+import HouseStock from '../viewmodel/wms/MaterialBoxInfo';
 import HashMap from '@ohos.util.HashMap';
 import CommonConstants from '../common/constants/CommonConstants';
 import DictInfo from '../viewmodel/DictInfo';

entry/src/main/ets/pages/LittleMaterialsStorage.ets

@@ -15,7 +15,10 @@ import {RgvInfo} from "../params/RobotsParam"
 import {NavigationBar} from '../component/NavigationBar'
 import {TimeAndTitle} from "../component/TimeAndTitle"
 import {InBoundView} from '../component/InBoundView'
-import {outBoxClass,materialsInfo,MaterialBoxInfo} from '../params/MaterialInformationParam'
+import {outBoxClass} from '../params/MaterialInformationParam'
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
+import MaterialInfo from '../viewmodel/wms/MaterialInfo';
+
 const TAG = 'LittleMaterialInbound';
 @Entry
 @Component
@@ -33,8 +36,8 @@ struct LittleMaterialsStorage{
   @State materialBoxes: MaterialBoxInfo[] = [];
   @State queryMaterialBoxNum:number = 0
   @State ScanMaterialList:WorkOrderInfo[] = []
-  @State reminds:string=''
-  @State queryTargetMaterial:materialsInfo={}
+  @State reminds: string=''
+  @State queryTargetMaterial: MaterialInfo = {}
   @StorageLink('materialBoxWeight') materialBoxWeight: number =0;
   @StorageLink('drawerPositionStatus') drawerPositionStatus: number=1 ;
   @State orders: OrderParams[] = [
@@ -114,7 +117,7 @@ struct LittleMaterialsStorage{
       if (this.materialBoxes[0]?.materials) {
         this.queryTargetMaterial = this.materialBoxes[0].materials.find(
           (material) => material.materialNo === currentMaterialNo
-        ) || {} as materialsInfo; // 如果找不到就使用空对象
+        ) || {} as MaterialInfo; // 如果找不到就使用空对象
       }
     }
   }

entry/src/main/ets/pages/RgvControl.ets

@@ -10,7 +10,8 @@ import {RobotInfo,RgvInfo,ErrorMessage,RequestParam,ConfirmDialogParams,RobotSin
 import CommonConstants from '../common/constants/CommonConstants'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import WmsRequest from '../common/util/request/WmsRequest'
-import {MaterialBoxInfo} from '../params/MaterialInformationParam'
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
+
 const TAG: string = 'RGV'
 @Entry
 @Component

entry/src/main/ets/params/MaterialInformationParam.ets

@@ -29,50 +29,6 @@ export interface MaterialListInformation {
   warningMsg: string;
 }
 
-export interface MaterialBoxInfo {
-  coordinate?: string;
-  houseArea?: string;
-  houseNo?: string;
-  houseType?: string;
-  //位置
-  locationNo?: string;
-  planNo?: string;
-  //层数
-  position?: number;
-  taskNo?: string;
-  //料箱编码
-  vehicleCode?: string;
-  materials?:materialsInfo[]
-
-  index?:number
-  //产品规格
-  spec?:string
-  //	物料名称
-  materialName?:string
-  //物料编码
-  materialNo?: string
-  //	序列号
-  seqNo?: string
-  //单位
-  unit?:string
-  //数量
-  num?:number
-  //批次号
-  batchCode?:string
-  applyCode?: string;
-  materialCode?: string;
-  unitDictLabel?: string;
-}
-
-export interface materialsInfo {
-  codes?:[]
-  materialName?: string,
-  materialNo?: string,
-  num?: number,
-  spec?:string
-  unit?: string
-}
-
 export interface outBoxClass {
   //料箱ID
   vehicleId: string

entry/src/main/ets/view/wms/OperationMaterialKitTwoStep.ets

@@ -3,13 +3,13 @@ import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
 import OperationItem from '../../viewmodel/wms/OperationItem'
 import WmsRequest from '../../common/util/request/WmsRequest'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
-import HouseStock from '../../viewmodel/wms/HouseStock'
+import HouseStock from '../../viewmodel/wms/MaterialBoxInfo'
 import CommonConstants from '../../common/constants/CommonConstants'
 import DictInfo from '../../viewmodel/DictInfo'
 import HashMap from '@ohos.util.HashMap'
 import VehicleInfo from '../../viewmodel/wms/VehicleInfo'
 import { InBoundView } from '../../component/InBoundView'
-import HouseStockMaterial from '../../viewmodel/wms/HouseStockMaterial'
+import HouseStockMaterial from '../../viewmodel/wms/MaterialInfo'
 import promptAction from '@ohos.promptAction'
 import OperationMaterial from '../../viewmodel/wms/OperationMaterial'
 

entry/src/main/ets/view/wms/OrderMaterialStorageSecondStep.ets

@@ -1,7 +1,7 @@
 import {SingleOrder,BoxGrid,RemindDialog} from "../../component/OrderMaterialsStorageView"
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
 import WmsRequest from '../../common/util/request/WmsRequest'
-import {MaterialBoxInfo,outBoxClass,materialsInfo} from '../../params/MaterialInformationParam'
+import {outBoxClass} from '../../params/MaterialInformationParam'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
 import promptAction from '@ohos.promptAction';
 import CommonConstants from '../../common/constants/CommonConstants'
@@ -9,6 +9,8 @@ import {RgvInfo} from "../../params/RobotsParam"
 import {CommonConfirmDialog}from "../../component/OrderMaterialsStorageView"
 import {ConfirmDialogParams} from "../../params/OrderMaterialsStorageParams"
 import RobotErrorHandleRequest from '../../common/util/request/RobotErrorHandleRequest'
+import MaterialBoxInfo from '../../viewmodel/wms/MaterialBoxInfo'
+import MaterialInfo from '../../viewmodel/wms/MaterialInfo'
 
 @Component
 export struct OrderMaterialStorageSecondStep {
@@ -22,7 +24,7 @@ export struct OrderMaterialStorageSecondStep {
   @State queryMaterialBoxNum:number = 0
   @State isQueryMaterial: boolean = false
   @State emptyBoxes: MaterialBoxInfo[] = []
-  @State queryTargetMaterial:materialsInfo={}
+  @State queryTargetMaterial: MaterialInfo = {}
   @State materialBoxes: MaterialBoxInfo[] = []
   @State reminds:string='1'
   @StorageLink('materialBoxWeight') materialBoxWeight: number =0;
@@ -58,7 +60,7 @@ export struct OrderMaterialStorageSecondStep {
       if (this.materialBoxes[0]?.materials) {
         this.queryTargetMaterial = this.materialBoxes[0].materials.find(
           (material) => material.materialNo === currentMaterialNo
-        ) || {} as materialsInfo; // 如果找不到就使用空对象
+        ) || {} as MaterialInfo; // 如果找不到就使用空对象
       }
     }
   }

entry/src/main/ets/viewmodel/wms/HouseStock.ets

@@ -1,6 +1,6 @@
-import HouseStockMaterial from './HouseStockMaterial';
+import HouseStockMaterial from './MaterialInfo';
 // 库存物料信息
-export default class HouseStock {
+export default class MaterialBoxInfo {
   // 入库单号
   taskNo?: string;
   // 计划单号
@@ -33,6 +33,8 @@ export default class HouseStock {
   batchCode?: string;
   // 物料编号
   materialNo?: string;
+  // 物料编号
+  materialCode?: string;
   // 物料名称
   materialName?: string;
   // 物料规格

entry/src/main/ets/viewmodel/wms/HouseStockMaterial.ets

@@ -1,5 +1,5 @@
 // 库存物料信息
-export default class HouseStockMaterial {
+export default class MaterialInfo {
   // 物料编号
   materialNo?: string;
   // 物料编号

entry/src/main/ets/viewmodel/wms/RequestParamModel.ets

@@ -1,5 +1,5 @@
 import {detailsListClass} from '../wms/InBoundOrderInfo'
-import HouseStockMaterial from './HouseStockMaterial';
+import MaterialInfo from './MaterialInfo';
 
 //通用请求后台参数
 export default class RequestParamModel {
@@ -42,5 +42,5 @@ export default class RequestParamModel {
   // 工序id
   operationId?: number | string
   // 工序绑定载具物料参数
-  processVehicleMaterialList?: HouseStockMaterial[]
+  processVehicleMaterialList?: MaterialInfo[]
 }

entry/src/main/ets/viewmodel/wms/VehicleInfo.ets

@@ -1,5 +1,5 @@
 // 料箱信息
-import HouseStock from './HouseStock';
+import MaterialBoxInfo from './MaterialBoxInfo';
 
 export default class VehicleInfo {
   // 料箱编号
@@ -15,5 +15,5 @@ export default class VehicleInfo {
   // 坐标
   coordinate?: string;
   // 库存物料信息集合
-  list?: HouseStock[]
+  list?: MaterialBoxInfo[]
 }