统一类型

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

@@ -8,10 +8,10 @@ import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import CommonConstants from '../common/constants/CommonConstants'
 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';
+import MaterialInfo from '../viewmodel/wms/MaterialInfo';
 
 @Component
 export struct InBoundView {
@@ -26,7 +26,7 @@ export struct InBoundView {
   //入库按钮缩放
   @State InboundButtonClick :number = 1
   //入库料箱物料表
-  @Link private boxMaterials: Array<MaterialBoxInfo>
+  @Link private boxMaterials: Array<MaterialInfo>
   //弹窗提示内容
   @State reminds:string = ''
   //全局变量 料箱重量
@@ -77,7 +77,7 @@ export struct InBoundView {
       houseNo:'1',
       stanCode:CommonConstants.STATION_CODE,
       vehicleCode:this.materialBoxID,
-      detailsList:this.boxMaterials
+      detailsList: this.boxMaterials
     } as RequestParamModel)
     console.log('testTag', 'aaaaaaaa1' + JSON.stringify(res));
     this.boxMaterials = []

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

@@ -4,6 +4,7 @@ import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
 import WmsRequest from '../common/util/request/WmsRequest'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo'
+import MaterialInfo from '../viewmodel/wms/MaterialInfo'
 
 @Component
 export struct ProcessFlow {
@@ -559,7 +560,7 @@ export struct MaterialList {
 @Component
 export struct MaterialListComponent {
   private scrollerForList: Scroller = new Scroller()
-  @Link ScanMaterialList: WorkOrderInfo[]
+  @Link scanMaterialList: MaterialInfo[]
   @Link materialNum :number
 
   // 选中回调函数
@@ -567,7 +568,7 @@ export struct MaterialListComponent {
   build() {
     Column() { // 订单列表
       List({ space: 8,scroller:this.scrollerForList }) {
-        ForEach(this.ScanMaterialList, (item: WorkOrderInfo, index) => {
+        ForEach(this.scanMaterialList, (item: MaterialInfo, index) => {
           ListItem() {
             Row() {
               Column(){
@@ -613,7 +614,7 @@ export struct MaterialListComponent {
                   .height($r('app.float.virtualSize_48'))
                   .fillColor($r('app.color.FF453A'))
                   .onClick(()=>{
-                    this.ScanMaterialList.splice(index, 1);
+                    this.scanMaterialList.splice(index, 1);
                     this.materialNum--
                   })
               }.width('10%')

entry/src/main/ets/pages/EmptyBoxStorage.ets

@@ -6,6 +6,8 @@ import {TimeAndTitle} from "../component/TimeAndTitle"
 import {InBoundView} from '../component/InBoundView'
 import router from '@ohos.router';
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
+import MaterialInfo from '../viewmodel/wms/MaterialInfo';
+
 @Entry
 @Component
 struct emptyBoxStorage {
@@ -17,7 +19,7 @@ struct emptyBoxStorage {
   @State printButtonClick :number = 1
   @State writeButtonClick :number = 1
   @State materialNum: number=0
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  @State scanMaterialList: MaterialInfo[] = []
   build() {
     Row() {
       Column() {
@@ -246,7 +248,7 @@ struct emptyBoxStorage {
           Column(){
             InBoundView({
               materialNum:this.materialNum,
-              boxMaterials:this.ScanMaterialList
+              boxMaterials:this.scanMaterialList
             })
           }
           .width('29%')

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

@@ -16,16 +16,15 @@ import { TimeAndTitle } from "../component/TimeAndTitle"
 import { InBoundView } from '../component/InBoundView'
 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/MaterialBoxInfo';
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
 import HashMap from '@ohos.util.HashMap';
 import CommonConstants from '../common/constants/CommonConstants';
 import DictInfo from '../viewmodel/DictInfo';
 import RobotErrorHandleRequest from '../common/util/request/RobotErrorHandleRequest';
 import { ConfirmDialogParams, RgvInfo } from '../params/RobotsParam';
-import VehicleInfo from '../viewmodel/wms/VehicleInfo';
 import promptAction from '@ohos.promptAction';
+import VehicleInfo from '../viewmodel/wms/VehicleInfo';
+import MaterialInfo from '../viewmodel/wms/MaterialInfo';
 
 @Entry
 @Component
@@ -33,11 +32,11 @@ struct LittleMaterialsOutBound {
   // 输入的物料编码
   @State inputCode: string = ''
   // 查询到的物料库存列表
-  @State materialArray: HouseStock[] = []
+  @State materialArray: MaterialBoxInfo[] = []
   // 选中的库存的物料编码
   @State selectMaterialCode: string = ''
   // 物料关联的库存（料箱）信息——选择料箱使用
-  @State houseStocks: HouseStock[] = []
+  @State materialBoxInfos: MaterialBoxInfo[] = []
   // 选中的料箱
   @State selectVehicleIndex: number = -1
   // 料箱类型数据字典
@@ -46,17 +45,21 @@ struct LittleMaterialsOutBound {
 
   // 扫描或手动输入的物料编码
   @State scanCode: string = ''
+  // 出入口料口中的物料信息
   @State materialNum: number = 0
+  // 出库料箱中的库存物料信息
+  outMaterialBoxInfos: MaterialInfo[] = []
+  // 扫码待出库的物料
+  @State scanMaterialList: MaterialInfo[] = []
+
   @State currentStep: number = 1;
-  @State nextStepButtonClick :number = 1
-  @State preStepButtonClick :number = 1
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  @State nextStepButtonClick: number = 1
+  @State preStepButtonClick: number = 1
   @State outBoundButtonClick :number = 1
-  @State materialData: WorkOrderMaterialInfo[] = [];
 
   // 根据物料编码【模糊】查询库存
   getStoreList = async () => {
-    let res: HouseStock[] = await WmsRequest.post('/api/v1/stock/mergeList', {
+    let res: MaterialBoxInfo[] = await WmsRequest.post('/api/v1/stock/mergeList', {
       houseType: '1',
       materialNo: this.inputCode
     } as RequestParamModel)
@@ -68,7 +71,7 @@ struct LittleMaterialsOutBound {
 
   //请求物料位置
   queryMaterialPosition = async () => {
-    this.houseStocks = await WmsRequest.post('/api/v1/stock/groupList', {
+    this.materialBoxInfos = await WmsRequest.post('/api/v1/stock/groupList', {
       materialNo: this.selectMaterialCode
     } as RequestParamModel)
   }
@@ -167,12 +170,17 @@ struct LittleMaterialsOutBound {
     //
     //   }
     // });
-    await WmsRequest.post('/api/v1/wmsOrder/outBox', {
+    let res: VehicleInfo = await WmsRequest.post('/api/v1/wmsOrder/outBox', {
       stanCode: CommonConstants.STATION_CODE,
-      vehicleNo: this.houseStocks[this.selectVehicleIndex].vehicleCode!,
-      houseNo: this.houseStocks[this.selectVehicleIndex].houseNo!
+      vehicleNo: this.materialBoxInfos[this.selectVehicleIndex].vehicleCode!,
+      houseNo: this.materialBoxInfos[this.selectVehicleIndex].houseNo!
     } as RequestParamModel)
 
+    if (res && res.list) {
+      this.outMaterialBoxInfos = res.list
+      this.materialNum = res.list.length
+    }
+
     promptAction.showToast({
       message: "箱子正在运行中....",
       duration: 1800,
@@ -298,7 +306,7 @@ struct LittleMaterialsOutBound {
               .backgroundColor($r('app.color.000000'))
               Row().height('2.6%')
               List({space: 8}) {
-                ForEach(this.materialArray, (item: HouseStock)=>{
+                ForEach(this.materialArray, (item: MaterialBoxInfo)=>{
                   ListItem() {
                     Column({space: 1}) {
                       Row() {
@@ -372,7 +380,7 @@ struct LittleMaterialsOutBound {
                 // 动态排列容器
                 Scroll() {
                   Flex({ wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) {
-                    ForEach(this.houseStocks, (item: HouseStock, index: number) => {
+                    ForEach(this.materialBoxInfos, (item: MaterialBoxInfo, index: number) => {
                       Column({ space: 5 }) {
                         Row() {
                           Text(item.materials?.[0]?.materialName! + '-' + item.materials?.[0]?.materialNo!)
@@ -453,7 +461,7 @@ struct LittleMaterialsOutBound {
             Column() {
               InBoundView({
                 materialNum: this.materialNum,
-                boxMaterials:this.ScanMaterialList
+                boxMaterials:this.scanMaterialList
               });
             }
             .height('100%')

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

@@ -35,7 +35,7 @@ struct LittleMaterialsStorage{
   @State outBoundButtonClick :number = 1
   @State materialBoxes: MaterialBoxInfo[] = [];
   @State queryMaterialBoxNum:number = 0
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  @State scanMaterialList: MaterialInfo[] = []
   @State reminds: string=''
   @State queryTargetMaterial: MaterialInfo = {}
   @StorageLink('materialBoxWeight') materialBoxWeight: number =0;
@@ -63,12 +63,12 @@ struct LittleMaterialsStorage{
   ScanMaterialCode = async (itemCode: string) => {
     try{
       this.scanMaterialValue = ""
-      let res: WorkOrderInfo = await WmsRequest.post("/api/v1/process/circulation/material", {
+      let res: MaterialInfo = await WmsRequest.post("/api/v1/process/circulation/material", {
         label: `BM${itemCode};18*18*1-6;SL50;20240111` //"#gys022#sc022#100#20220929#31"
       } as RequestParamModel)
 
       // 验证1：检查是否已在扫描列表中
-      const isDuplicate = this.ScanMaterialList.some(
+      const isDuplicate = this.scanMaterialList.some(
         item => item.materialCode === res.materialCode
       );
       if (isDuplicate) {
@@ -80,8 +80,8 @@ struct LittleMaterialsStorage{
         }, 2000);
         return
       }
-      this.ScanMaterialList = [...this.ScanMaterialList, res];
-      this.materialNum = this.ScanMaterialList.length; // 更新物料数量统计
+      this.scanMaterialList = [...this.scanMaterialList, res];
+      this.materialNum = this.scanMaterialList.length; // 更新物料数量统计
     }catch (err) {
       console.error(TAG, `http ScanMaterialCode failed: ${JSON.stringify(err)}`);
     }
@@ -482,7 +482,7 @@ struct LittleMaterialsStorage{
 
                 Row() {
                   MaterialListComponent({
-                    ScanMaterialList:this.ScanMaterialList,
+                    scanMaterialList:this.scanMaterialList,
                     materialNum:this.materialNum
                   }).width('95%')
                 }.width('100%').height('90%').justifyContent(FlexAlign.Center)
@@ -496,7 +496,7 @@ struct LittleMaterialsStorage{
               Column(){
                 InBoundView({
                   materialNum:this.materialNum,
-                  boxMaterials:this.ScanMaterialList
+                  boxMaterials:this.scanMaterialList
                 })
               }.width('29%').backgroundColor($r('app.color.10FFFFFF'))
             }

entry/src/main/ets/pages/OperationMaterialKit.ets

@@ -18,6 +18,8 @@ import CommonConstants from '../common/constants/CommonConstants'
 import RobotErrorHandleRequest from '../common/util/request/RobotErrorHandleRequest'
 import { ConfirmDialogParams, RgvInfo } from '../params/RobotsParam'
 import { CommonConfirmDialog, ProcessFlow, RemindDialog } from '../component/OrderMaterialsStorageView'
+import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo'
+import MaterialInfo from '../viewmodel/wms/MaterialInfo'
 
 @Entry
 @Component
@@ -30,6 +32,8 @@ struct OperationMaterialKit {
   @State selectOperations: OperationInfo[] = []
   // 选中工序需求的物料
   @State operationItems: OperationItem[] = []
+  // 出库料箱中的库存物料信息
+  @State outMaterialBoxInfos: MaterialInfo[] = []
   // 抽屉称重（根据重量判断抽屉是否有料箱）
   @StorageLink('materialBoxWeight') materialBoxWeight: number = 0
   // 抽屉状态
@@ -200,12 +204,14 @@ struct OperationMaterialKit {
             workOrder: this.workOrder,
             selectOperations: this.selectOperations,
             operationItems: this.operationItems,
+            outMaterialBoxInfos: this.outMaterialBoxInfos,
           })
         } else {
           OperationMaterialKitThreeStep({
             workOrder: this.workOrder,
             selectOperations: this.selectOperations,
             operationItems: this.operationItems,
+            outMaterialBoxInfos: this.outMaterialBoxInfos,
           })
         }
       }

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

@@ -2,6 +2,8 @@ import OperationInfo from '../../viewmodel/wms/OperationInfo'
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
 import OperationItem from '../../viewmodel/wms/OperationItem'
 import { InBoundView } from '../../component/InBoundView'
+import MaterialBoxInfo from '../../viewmodel/wms/MaterialBoxInfo'
+import MaterialInfo from '../../viewmodel/wms/MaterialInfo'
 
 @Component
 export struct OperationMaterialKitThreeStep {
@@ -9,16 +11,22 @@ export struct OperationMaterialKitThreeStep {
   @Link workOrder: WorkOrderInfo
   @Link selectOperations: OperationInfo[]
   @Link operationItems: OperationItem[]
+  // 出库料箱中的库存物料信息
+  @Link outMaterialBoxInfos: MaterialInfo[]
   @State materialNum: number = 0
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  @State scanMaterialList: MaterialBoxInfo[] = []
+
+  aboutToAppear(): void {
+    this.materialNum = this.outMaterialBoxInfos.length
+  }
 
   build() {
     Row() {
       // 出入库料口操作
       Column() {
         InBoundView({
-          materialNum:this.materialNum,
-          boxMaterials:this.ScanMaterialList
+          materialNum: this.materialNum,
+          boxMaterials: this.scanMaterialList
         });
       }
       .height('100%')

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/MaterialBoxInfo'
+import MaterialBoxInfo 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/MaterialInfo'
+import MaterialInfo from '../../viewmodel/wms/MaterialInfo'
 import promptAction from '@ohos.promptAction'
 import OperationMaterial from '../../viewmodel/wms/OperationMaterial'
 
@@ -19,14 +19,16 @@ export struct OperationMaterialKitTwoStep {
   @Link workOrder: WorkOrderInfo
   @Link selectOperations: OperationInfo[]
   @Link operationItems: OperationItem[]
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  // 出库料箱中的库存物料信息
+  @Link outMaterialBoxInfos: MaterialInfo[]
+  @State scanMaterialList: MaterialInfo[] = []
   selectOperationIds: string[] = []
   // 每个工序需要的物料编码分组
   operationItemCodes: HashMap<string, string[]> = new HashMap<string, string[]>()
   @State operationNames: string = ''
   // 选择已有料箱，出库料箱
   @State selectVehicleCode: string = ''
-  @State houseStocks: HouseStock[] = []
+  @State materialBoxInfos: MaterialBoxInfo[] = []
   @State materialNum: number = 0
   // 空箱编码
   @State vehicleCode: string = ''
@@ -34,35 +36,34 @@ export struct OperationMaterialKitTwoStep {
   // 扫描或手动输入的物料编码
   @State scanCode: string = ''
   // 物料全数组（本次扫描物料弹窗中展示）
-  @State materialArray: HouseStockMaterial[] = []
+  @State materialArray: MaterialInfo[] = []
   // 数量合并的物料数组（在拣选工作台展示）
-  @State materialMergeArray: HouseStockMaterial[] = []
+  @State materialMergeArray: MaterialInfo[] = []
   //齐套料箱扫码后如果物料存在则自动滚动所在列
   @State scanCodeIndex: number = -1
   materialScrollerController: Scroller = new Scroller()
-  // 出库料箱中的库存物料信息（暂时用不上）
-  outHouseStocks: HouseStock[] = []
 
-  houseStockDialogController: CustomDialogController = new CustomDialogController({
-    builder: houseStockDialog({
-      houseStocks: this.houseStocks,
+  // 选择料箱弹窗控制器
+  selectMaterialBoxDialogController: CustomDialogController = new CustomDialogController({
+    builder: SelectMaterialBoxDialog({
+      MaterialBoxInfos: this.materialBoxInfos,
       selectVehicleCode: this.selectVehicleCode,
       confirm: async () => {
-        if (!this.selectVehicleCode || !this.houseStocks || this.houseStocks.length <= 0) {
+        if (!this.selectVehicleCode || !this.materialBoxInfos || this.materialBoxInfos.length <= 0) {
           return
         }
         let houseNo = ''
-        for (const element of this.houseStocks) {
+        for (const element of this.materialBoxInfos) {
           if (this.selectVehicleCode === element.vehicleCode) {
             houseNo = element.houseNo!
           }
         }
-        let res: VehicleInfo = await WmsRequest.post("/api/v1/wmsOrder/outBox", {
+        let res: VehicleInfo = await WmsRequest.post('/api/v1/wmsOrder/outBox', {
           houseNo: houseNo,
           vehicleNo:this.selectVehicleCode,
         } as RequestParamModel)
         if (res && res.list) {
-          this.outHouseStocks = res.list
+          this.outMaterialBoxInfos = res.list
         }
       }
 
@@ -70,9 +71,9 @@ export struct OperationMaterialKitTwoStep {
     autoCancel: true, // 点击遮罩关闭
     customStyle: true,
   })
-
+  // 本次扫描物料弹窗控制器
   thisScanDialogController: CustomDialogController = new CustomDialogController({
-    builder: thisScanDialog({
+    builder: ThisScanDialog({
       materialMergeArray: this.materialMergeArray,
       materialArray: this.materialArray,
       confirm: async () => {}
@@ -83,9 +84,9 @@ export struct OperationMaterialKitTwoStep {
 
   // 齐套操作-扫描物料
   scanMaterialCode = async (itemCode: string) => {
-    this.scanCode = ""
-    let res: HouseStockMaterial = await WmsRequest.post("/api/v1/process/circulation/material", {
-      label: itemCode //"#gys022#sc022#100#20220929#31"
+    this.scanCode = ''
+    let res: MaterialInfo = await WmsRequest.post('/api/v1/process/circulation/material', {
+      label: itemCode //'#gys022#sc022#100#20220929#31'
     } as RequestParamModel)
     // 判断扫描完成后返回的物料码是否是当前需要齐套的物料
     let hasFlag: boolean = false
@@ -97,8 +98,8 @@ export struct OperationMaterialKitTwoStep {
     }
     if (!hasFlag) {
       promptAction.showToast({
-        message: "不是当前工序中的物料",
-        bottom: "50%",
+        message: '不是当前工序中的物料',
+        bottom: '50%',
         duration: 2000
       })
       return
@@ -121,6 +122,9 @@ export struct OperationMaterialKitTwoStep {
     // 物料全数组默认都新增在数组头部
     this.materialArray.unshift(res)
     this.materialScrollerController.scrollToIndex(this.scanCodeIndex)
+    for (const element of this.outMaterialBoxInfos) {
+
+    }
   }
 
   // 齐套绑定
@@ -128,7 +132,7 @@ export struct OperationMaterialKitTwoStep {
     // 接口只支持根据工序去绑定，需要先遍历
     let paramArray: RequestParamModel[] = []
     this.operationItemCodes.forEach((value: string[], key: string) => {
-      let itemArray: HouseStockMaterial[] = []
+      let itemArray: MaterialInfo[] = []
       for (const material of this.materialMergeArray) {
         if (value.includes(material.materialCode)) {
           itemArray.push(material)
@@ -149,7 +153,7 @@ export struct OperationMaterialKitTwoStep {
       return
     }
     for (const param of paramArray) {
-      await WmsRequest.post("api/v1/process/vehicleOperation/add", param)
+      await WmsRequest.post('api/v1/process/vehicleOperation/add', param)
     }
     // 重新刷新调取料箱下方物料已齐套数量
     let result: OperationMaterial[] = await WmsRequest.post('/api/v1/wms/operationMaterial/list', {
@@ -263,11 +267,11 @@ export struct OperationMaterialKitTwoStep {
                 if (!item.storageNum || item.storageNum! <= 0) {
                   return
                 }
-                this.houseStocks = await WmsRequest.post('/api/v1/process/vehicleOperation/processVehicle', {
+                this.materialBoxInfos = await WmsRequest.post('/api/v1/process/vehicleOperation/processVehicle', {
                   label: item.itemCode
-                } as RequestParamModel) as HouseStock[]
-                if (this.houseStocks) {
-                  for (const element of this.houseStocks) {
+                } as RequestParamModel) as MaterialBoxInfo[]
+                if (this.materialBoxInfos) {
+                  for (const element of this.materialBoxInfos) {
                     if (element.coordinate && element.coordinate.length > 0 && element.coordinate.indexOf('-') > 0) {
                       let coors = element.coordinate.split('-');
                       element.x = parseInt(coors[0])
@@ -275,7 +279,7 @@ export struct OperationMaterialKitTwoStep {
                     }
                   }
                 }
-                this.houseStockDialogController.open()
+                this.selectMaterialBoxDialogController.open()
               })
             }
           })
@@ -290,14 +294,14 @@ export struct OperationMaterialKitTwoStep {
       .justifyContent(FlexAlign.Center)
       .backgroundColor($r('app.color.10FFFFFF'))
 
-      Image($r("app.media.wms_arrow_right"))
+      Image($r('app.media.wms_arrow_right'))
         .height($r('app.float.virtualSize_48'))
         .width($r('app.float.virtualSize_48'))
       // 出入库料口操作
       Column() {
         InBoundView({
           materialNum:this.materialNum,
-          boxMaterials:this.ScanMaterialList
+          boxMaterials:this.scanMaterialList
         })
       }
       .height('100%')
@@ -305,7 +309,7 @@ export struct OperationMaterialKitTwoStep {
       .borderRadius($r('app.float.virtualSize_16'))
       .justifyContent(FlexAlign.Center)
       .backgroundColor($r('app.color.10FFFFFF'))
-      Image($r("app.media.wms_arrow_right"))
+      Image($r('app.media.wms_arrow_right'))
         .height($r('app.float.virtualSize_48'))
         .width($r('app.float.virtualSize_48'))
       // 拣选工作台
@@ -321,7 +325,7 @@ export struct OperationMaterialKitTwoStep {
         .justifyContent(FlexAlign.Center)
 
         Stack() {
-            Image(this.vehicleCode && this.vehicleCode.length > 0 ? $r("app.media.wms_read_vehicle") : $r("app.media.wms_not_read_vehicle"))
+            Image(this.vehicleCode && this.vehicleCode.length > 0 ? $r('app.media.wms_read_vehicle') : $r('app.media.wms_not_read_vehicle'))
               .width('100%')
               .height('100%')
               .borderRadius($r('app.float.virtualSize_16'))
@@ -342,7 +346,7 @@ export struct OperationMaterialKitTwoStep {
               .margin({top: $r('app.float.virtualSize_12'), right: $r('app.float.virtualSize_12')})
               Blank()
               Row({space: 3}) {
-                Image($r("app.media.wms_card_reader"))
+                Image($r('app.media.wms_card_reader'))
                   .height($r('app.float.virtualSize_24'))
                   .width($r('app.float.virtualSize_24'))
                   .fillColor(this.vehicleCode && this.vehicleCode.length > 0 ? $r('app.color.30D158') : $r('app.color.FF453A'))
@@ -397,7 +401,7 @@ export struct OperationMaterialKitTwoStep {
         .margin({top: $r('app.float.virtualSize_20'), bottom: $r('app.float.fontSize_12')})
         // 扫码得到的物料列表
         List({ scroller: this.materialScrollerController }) {
-          ForEach(this.materialMergeArray, (item: HouseStockMaterial)=>{
+          ForEach(this.materialMergeArray, (item: MaterialInfo)=>{
             ListItem() {
               Column() {
                 Row() {
@@ -488,7 +492,7 @@ export struct OperationMaterialKitTwoStep {
 
 // 库存信息弹窗（选择料箱）
 @CustomDialog
-struct houseStockDialog {
+struct SelectMaterialBoxDialog {
 
   // 若尝试在CustomDialog中传入多个其他的Controller，以实现在CustomDialog中打开另一个或另一些CustomDialog，那么此处需要将指向自己的controller放在最后
   controller?: CustomDialogController
@@ -498,7 +502,7 @@ struct houseStockDialog {
   }
   vehicleTypeDictType: string = 'vehicle_type'
   vehicleTypeDictMap: HashMap<string, string> = new HashMap<string, string>()
-  houseStocks: HouseStock[] = []
+  MaterialBoxInfos: MaterialBoxInfo[] = []
   scroller: Scroller = new Scroller()
   @Link selectVehicleCode: string
 
@@ -539,7 +543,7 @@ struct houseStockDialog {
       // 动态排列容器
       Scroll() {
         Flex({ wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) {
-          ForEach(this.houseStocks, (item: HouseStock, index: number) => {
+          ForEach(this.MaterialBoxInfos, (item: MaterialBoxInfo, index: number) => {
             Column({ space: 5 }) {
               Row() {
                 Text(item.materials?.[0]?.materialName! + '-' + item.materials?.[0]?.materialNo!)
@@ -650,7 +654,7 @@ struct houseStockDialog {
 
 // 本次扫描物料弹窗
 @CustomDialog
-struct thisScanDialog {
+struct ThisScanDialog {
 
   // 若尝试在CustomDialog中传入多个其他的Controller，以实现在CustomDialog中打开另一个或另一些CustomDialog，那么此处需要将指向自己的controller放在最后
   controller?: CustomDialogController
@@ -658,12 +662,12 @@ struct thisScanDialog {
   }
   confirm: () => void = () => {
   }
-  houseStocks: HouseStock[] = []
+  MaterialBoxInfos: MaterialBoxInfo[] = []
   scroller: Scroller = new Scroller()
-  @Link materialArray: HouseStockMaterial[]
-  @Link materialMergeArray: HouseStockMaterial[]
-  @State tempArray: HouseStockMaterial[] = []
-  tempMergeArray: HouseStockMaterial[] = []
+  @Link materialArray: MaterialInfo[]
+  @Link materialMergeArray: MaterialInfo[]
+  @State tempArray: MaterialInfo[] = []
+  tempMergeArray: MaterialInfo[] = []
 
   aboutToAppear(): void {
     if (this.materialArray && this.materialArray.length > 0) {
@@ -688,7 +692,7 @@ struct thisScanDialog {
       .justifyContent(FlexAlign.Center)
 
       List({space: 4, scroller: this.scroller}) {
-        ForEach(this.tempArray, (item: HouseStockMaterial, index: number) => {
+        ForEach(this.tempArray, (item: MaterialInfo, index: number) => {
           ListItem() {
             Row() {
               Column({space: 1}) {

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

@@ -6,6 +6,8 @@ import WmsRequest from '../../common/util/request/WmsRequest'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
 import {RemindDialog} from "../../component/OrderMaterialsStorageView"
 import WorkOrderMaterialInfo from "../../viewmodel/wms/WorkOrderMaterialInfo"
+import MaterialInfo from '../../viewmodel/wms/MaterialInfo'
+
 const TAG = 'OrderInbound';
 @Component
 export struct OrderMaterialStorageThirdStep {
@@ -25,7 +27,7 @@ export struct OrderMaterialStorageThirdStep {
   @State scanCodeValue :string = ''
   @State firstStepButtonClick:number = 1
   @State preStepButtonClick:number = 1
-  @State ScanMaterialList:WorkOrderInfo[] = []
+  @State scanMaterialList: MaterialInfo[] = []
   //提示信息
   @State reminds:string=''
 
@@ -43,12 +45,12 @@ export struct OrderMaterialStorageThirdStep {
     console.info(TAG,itemCode)
     try{
       this.scanCodeValue = ""
-      let res: WorkOrderInfo = await WmsRequest.post("/api/v1/process/circulation/material", {
+      let res: MaterialInfo = await WmsRequest.post("/api/v1/process/circulation/material", {
         label: `BM${itemCode};18*18*1-6;SL50;20240111` //"#gys022#sc022#100#20220929#31"
       } as RequestParamModel)
 
       // 验证1：检查是否已在扫描列表中
-      const isDuplicate = this.ScanMaterialList.some(
+      const isDuplicate = this.scanMaterialList.some(
         item => item.materialCode === res.materialCode
       );
       if (isDuplicate) {
@@ -75,8 +77,8 @@ export struct OrderMaterialStorageThirdStep {
       }
 
       // 无重复时，添加到列表
-      this.ScanMaterialList = [...this.ScanMaterialList, res];
-      this.materialNum = this.ScanMaterialList.length; // 更新物料数量统计
+      this.scanMaterialList = [...this.scanMaterialList, res];
+      this.materialNum = this.scanMaterialList.length; // 更新物料数量统计
 
     }catch (err) {
       console.error(TAG, `http ScanMaterialCode failed: ${JSON.stringify(err)}`);
@@ -127,7 +129,7 @@ export struct OrderMaterialStorageThirdStep {
 
           Row() {
             MaterialListComponent({
-              ScanMaterialList:this.ScanMaterialList,
+              scanMaterialList:this.scanMaterialList,
               materialNum:this.materialNum
             }).width('95%')
           }.width('100%').height('90%').justifyContent(FlexAlign.Center)
@@ -141,7 +143,7 @@ export struct OrderMaterialStorageThirdStep {
         Column(){
           InBoundView({
             materialNum:this.materialNum,
-            boxMaterials:this.ScanMaterialList
+            boxMaterials:this.scanMaterialList
           })
         }.width('29%').backgroundColor($r('app.color.10FFFFFF'))
       }

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

@@ -36,25 +36,3 @@ interface Records{
   updator: string;
   vehicleCode: string;
 }
-
-export interface detailsListClass {
-
-  applyCode?: string;
-  //批次号
-  batchCode?: string;
-  //
-  materialCode?: string;
-  //物料名称
-  materialName?: string;
-  //物料编码
-  materialNo?: string;
-  //出入库数量
-  num?: number;
-  //	序列号
-  seqNo?: string;
-  //产品规格
-  spec?: string;
-  //单位
-  unit?: string;
-  unitDictLabel?: string;
-}

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

@@ -1,4 +1,4 @@
-import HouseStockMaterial from './MaterialInfo';
+import MaterialInfo from './MaterialInfo';
 // 库存物料信息
 export default class MaterialBoxInfo {
   // 入库单号
@@ -18,7 +18,7 @@ export default class MaterialBoxInfo {
   // 位置
   position?: number;
   // 库存物料信息
-  materials?: HouseStockMaterial[];
+  materials?: MaterialInfo[];
   // 仓库类型
   houseType?: string;
   // 仓库编号

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

@@ -14,4 +14,8 @@ export default class MaterialInfo {
   unit?: string;
   // 流转卡号/序列号
   batchCode?: string;
+  // 流转卡号/序列号
+  batchNo?: string;
+  // 物料单位
+  unitDictLabel?:string
 }

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

@@ -1,4 +1,4 @@
-import {detailsListClass} from '../wms/InBoundOrderInfo'
+import MaterialBoxInfo from './MaterialBoxInfo';
 import MaterialInfo from './MaterialInfo';
 
 //通用请求后台参数
@@ -28,7 +28,7 @@ export default class RequestParamModel {
   // 工序id数组
   operationIds?: string[]
   //入库详情
-  detailsList?:detailsListClass[]
+  detailsList?: MaterialInfo[]
   //用户名
   userName?:string
   //密码