参数放到viewModel

entry/src/main/ets/common/constants/CommonConstants.ets

@@ -1,4 +1,4 @@
-import {RobotInfo} from '../../params/RobotsParam'
+import {RobotInfo} from '../../viewmodel/wms/rgv/RobotsParam'
 import DictValue from '../../viewmodel/DictValue'
 import HashMap from '@ohos.util.HashMap'
 

entry/src/main/ets/common/util/request/WmsRequest.ets

@@ -13,7 +13,7 @@ import { printError, printRequest, printResponse, handleRes } from './Helps';
 // jiaxiaoqiang：这里要改
 //const baseUrl = "http://192.168.1.3:11010/" //chuangke
 //const baseUrl = "http://192.168.1.174:8079"//huajing
-const baseUrl = "http://192.168.1.3:8079"//huajing
+const baseUrl = "http://192.168.1.3:20010"//huajing
 // const baseUrl = "http://192.168.1.4:8079/" //chuangke
 const DEBUG = true //
 

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

@@ -81,6 +81,7 @@ export struct InBoundView {
     } as RequestParamModel)
     console.log('testTag', 'aaaaaaaa1' + JSON.stringify(res));
     this.boxMaterials = []
+    this.materialNum = 0 ;
     promptAction.showToast({
       message: '请求成功，业务处理中。。。',
       duration: 2000,
@@ -115,6 +116,7 @@ export struct InBoundView {
     MqttManager.publish('station100/cmd/devices', drawerCommand, 1, true);
   }
   aboutToAppear(): void {
+    console.info("sssss"+JSON.stringify(this.boxMaterials))
     // this.materialBoxID = CommonConstants.MATERIAL_BOX_ID
   }
 

entry/src/main/ets/component/WarehousingStaticsView.ets

@@ -1,5 +1,4 @@
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
-import {DemandMaterial,MaterialBox,EmptyBox} from "../params/OrderMaterialsStorageParams"
 import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
 import WmsRequest from '../common/util/request/WmsRequest'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
@@ -420,7 +419,6 @@ struct MaterialBoxDialog {
     this.selectedMaterialIndex = index
   }
   @State materialBoxes: MaterialBoxInfo[] = [];
-  @Prop emptyBoxes: EmptyBox[] = [];
   controller: CustomDialogController
   searchRequestMaterial: () => void = () => {}
 

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

@@ -17,7 +17,7 @@ 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 { ConfirmDialogParams, RgvInfo }  from "../viewmodel/wms/rgv/RobotsParam"
 import promptAction from '@ohos.promptAction';
 import VehicleInfo from '../viewmodel/wms/VehicleInfo';
 import MaterialInfo from '../viewmodel/wms/MaterialInfo';

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

@@ -2,20 +2,18 @@
  * 零星物料入库
  * */
 import {ProcessFlow,BoxGrid,MaterialListComponent,RemindDialog} from "../component/OrderMaterialsStorageView"
-import {OrderParams,MaterialBox, EmptyBox} from "../params/OrderMaterialsStorageParams"
 import router from '@ohos.router';
 import RobotErrorHandleRequest from '../common/util/request/RobotErrorHandleRequest'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import {CommonConfirmDialog}from "../component/OrderMaterialsStorageView"
 import {ConfirmDialogParams} from "../params/OrderMaterialsStorageParams"
-import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import CommonConstants from '../common/constants/CommonConstants'
 import WmsRequest from '../common/util/request/WmsRequest'
-import {RgvInfo} from "../params/RobotsParam"
+import {RgvInfo} from "../viewmodel/wms/rgv/RobotsParam"
 import {NavigationBar} from '../component/NavigationBar'
 import {TimeAndTitle} from "../component/TimeAndTitle"
 import {InBoundView} from '../component/InBoundView'
-import {outBoxClass} from '../params/MaterialInformationParam'
+import {OutBoxClass} from '../viewmodel/wms/OutBoxClass'
 import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
 import MaterialInfo from '../viewmodel/wms/MaterialInfo';
 
@@ -26,28 +24,27 @@ struct LittleMaterialsStorage{
   @State materialNum:number=0
   @State currentStep: number = 1;
   @State emptyBoxes: MaterialBoxInfo[] = []
+  //步骤一的扫描
   @State scanBoxValue:string = ''
+  //步骤二的扫描
   @State scanMaterialValue:string = ''
   @State selectedMaterialBox: MaterialBoxInfo = {};
+  //是否查询料箱
   @State isQueryMaterial : boolean = false
+  //按钮缩放标志
   @State nextStepButtonClick :number = 1
   @State preStepButtonClick :number = 1
   @State outBoundButtonClick :number = 1
+  //查询到的料箱
   @State materialBoxes: MaterialBoxInfo[] = [];
+  //查询的料箱数量
   @State queryMaterialBoxNum:number = 0
   @State scanMaterialList: MaterialInfo[] = []
   @State reminds: string=''
+  //查询到目标物料信息
   @State queryTargetMaterial: MaterialInfo = {}
   @StorageLink('materialBoxWeight') materialBoxWeight: number =0;
   @StorageLink('drawerPositionStatus') drawerPositionStatus: number=1 ;
-  @State orders: OrderParams[] = [
-    { orderName: '订单名称XXXXX', orderNo: '123123213', date: '2025/11/11', progress: '50%' },
-    { orderName: '订单名称XXXX', orderNo: '123123213', date: '2025/11/11', progress: '75%' },
-    { orderName: '特殊订单', orderNo: 'SH2024001', date: '2024/03/01', progress: '100%' },
-    { orderName: '订单名称XXXXX', orderNo: '123123213', date: '2025/11/11', progress: '50%' },
-    { orderName: '订单名称XXXX', orderNo: '123123213', date: '2025/11/11', progress: '75%' },
-    { orderName: '特殊订单', orderNo: 'SH2024001', date: '2024/03/01', progress: '100%' }
-  ]
   remindController: CustomDialogController = new CustomDialogController({
     builder: RemindDialog({
       remind: this.reminds,}
@@ -147,7 +144,7 @@ struct LittleMaterialsStorage{
 
   boxOutBound = async () => {
     try {
-      const res: outBoxClass = await WmsRequest.post("/api/v1/wmsOrder/outBox", {
+      const res: OutBoxClass = await WmsRequest.post("/api/v1/wmsOrder/outBox", {
         houseNo: this.selectedMaterialBox?.houseNo,
         vehicleNo: this.selectedMaterialBox?.vehicleCode,
         stanCode: CommonConstants.STATION_CODE

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

@@ -16,7 +16,7 @@ import promptAction from '@ohos.promptAction'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import CommonConstants from '../common/constants/CommonConstants'
 import RobotErrorHandleRequest from '../common/util/request/RobotErrorHandleRequest'
-import { ConfirmDialogParams, RgvInfo } from '../params/RobotsParam'
+import { ConfirmDialogParams, RgvInfo }  from "../viewmodel/wms/rgv/RobotsParam"
 import { CommonConfirmDialog, ProcessFlow, RemindDialog } from '../component/OrderMaterialsStorageView'
 import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo'
 import MaterialInfo from '../viewmodel/wms/MaterialInfo'

entry/src/main/ets/pages/OrderMaterialsStorage.ets

@@ -2,7 +2,7 @@
  * 订单物料入库
  * */
 import {ProcessFlow} from "../component/OrderMaterialsStorageView"
-import {OrderParams,DemandMaterial,MaterialBox, EmptyBox} from "../params/OrderMaterialsStorageParams"
+
 import router from '@ohos.router';
 import {NavigationBar} from '../component/NavigationBar'
 import {TimeAndTitle} from "../component/TimeAndTitle"
@@ -11,6 +11,8 @@ import {OrderMaterialStorageSecondStep} from '../view/wms/OrderMaterialStorageSe
 import {OrderMaterialStorageThirdStep} from '../view/wms/OrderMaterialStorageThirdStep'
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
+import MaterialInfo from '../viewmodel/wms/MaterialInfo';
+
 @Entry
 @Component
 struct orderMaterialsStorage {
@@ -19,6 +21,7 @@ struct orderMaterialsStorage {
   @State selectWorkOrder:WorkOrderInfo = {}
   @State messages:string[] = []
   @State currentStep: number = 1;
+  @State  scanMaterialList: MaterialInfo[] = []
   build() {
     Row() {
       Column() {
@@ -84,6 +87,7 @@ struct orderMaterialsStorage {
         }
         if(this.currentStep === 3){
           OrderMaterialStorageThirdStep({
+            scanMaterialList:this.scanMaterialList,
             currentStep:this.currentStep,
             materialData:this.materialData
           })

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

@@ -6,7 +6,7 @@ import {InfoRow} from '../component/RgvControlView'
 import RobotErrorHandleRequest from '../common/util/request/RobotErrorHandleRequest'
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import {RgvButton,RemindDialog,MoveControllerButton,CommonConfirmDialog,MoveDialog}from "../component/RgvControlView"
-import {RobotInfo,RgvInfo,ErrorMessage,RequestParam,ConfirmDialogParams,RobotSingleMovePost} from "../params/RobotsParam"
+import {RobotInfo,RgvInfo,ErrorMessage,RequestParam,ConfirmDialogParams,RobotSingleMovePost} from "../viewmodel/wms/rgv/RobotsParam"
 import CommonConstants from '../common/constants/CommonConstants'
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import WmsRequest from '../common/util/request/WmsRequest'

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

@@ -1,37 +0,0 @@
-// 响应接口
-export interface MaterialListInformation {
-  batchCode: string;
-  codeStr: string;
-  coordinate: string;
-  created: string;
-  creator: string;
-  deptId: string;
-  houseArea: string;
-  houseNo: string;
-  houseType: string;
-  id: string;
-  locationNo: string;
-  //物料名称
-  materialName: string;
-  //物料编码
-  materialNo: string;
-  num: number;
-  orgId: string;
-  planNo: string;
-  position: number;
-  seqNo: string;
-  spec: string;
-  taskNo: string;
-  unit: string;
-  updated:string;
-  updator: string;
-  vehicleCode: string;
-  warningMsg: string;
-}
-
-export interface outBoxClass {
-  //料箱ID
-  vehicleId: string
-  //料箱名称
-  vehicleName: string
-}

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

@@ -1,6 +1,6 @@
 //叫料通知
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
-import {OrderParams,DemandMaterial} from "../../params/OrderMaterialsStorageParams"
+import {DemandMaterial} from "../../viewmodel/wms/OrderMaterialsStorageParams"
 import WmsRequest from '../../common/util/request/WmsRequest'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
 import { NotificationInfo} from '../../viewmodel/wms/NotificationInfo'

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

@@ -1,5 +1,4 @@
 import {MaterialList,OrderListComponent} from "../../component/OrderMaterialsStorageView"
-import {OrderParams,DemandMaterial} from "../../params/OrderMaterialsStorageParams"
 import WmsRequest from '../../common/util/request/WmsRequest'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'

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

@@ -1,12 +1,12 @@
 import {SingleOrder,BoxGrid,RemindDialog} from "../../component/OrderMaterialsStorageView"
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
 import WmsRequest from '../../common/util/request/WmsRequest'
-import {outBoxClass} from '../../params/MaterialInformationParam'
 import RequestParamModel from '../../viewmodel/wms/RequestParamModel'
 import promptAction from '@ohos.promptAction';
 import CommonConstants from '../../common/constants/CommonConstants'
-import {RgvInfo} from "../../params/RobotsParam"
+import {RgvInfo} from "../../viewmodel/wms/rgv/RobotsParam"
 import {CommonConfirmDialog}from "../../component/OrderMaterialsStorageView"
+import {OutBoxClass} from '../../viewmodel/wms/OutBoxClass'
 import {ConfirmDialogParams} from "../../params/OrderMaterialsStorageParams"
 import RobotErrorHandleRequest from '../../common/util/request/RobotErrorHandleRequest'
 import MaterialBoxInfo from '../../viewmodel/wms/MaterialBoxInfo'
@@ -98,7 +98,7 @@ export struct OrderMaterialStorageSecondStep {
 
   boxOutBound = async () => {
     try {
-      const res: outBoxClass = await WmsRequest.post("/api/v1/wmsOrder/outBox", {
+      const res: OutBoxClass = await WmsRequest.post("/api/v1/wmsOrder/outBox", {
         houseNo: this.selectedMaterialBox?.houseNo,
         vehicleNo: this.selectedMaterialBox?.vehicleCode,
         stanCode: CommonConstants.STATION_CODE

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

@@ -1,5 +1,4 @@
 import {MaterialListComponent} from "../../component/OrderMaterialsStorageView"
-import {OrderParams,DemandMaterial,MaterialBox, EmptyBox} from "../../params/OrderMaterialsStorageParams"
 import {InBoundView} from '../../component/InBoundView'
 import WorkOrderInfo from '../../viewmodel/wms/WorkOrderInfo'
 import WmsRequest from '../../common/util/request/WmsRequest'
@@ -16,11 +15,10 @@ export struct OrderMaterialStorageThirdStep {
   @State materialNum:number= 0
   //当前步骤
   @Link currentStep: number
-  @State orders:OrderParams[]= []
   @State scanCodeValue :string = ''
   @State firstStepButtonClick:number = 1
   @State preStepButtonClick:number = 1
-  @State scanMaterialList: MaterialInfo[] = []
+  @Link scanMaterialList: MaterialInfo[]
   //提示信息
   @State reminds:string=''
 

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

@@ -1,4 +1,4 @@
-import {LogInfo} from '../../params/LogParam'
+import {LogInfo} from '../../viewmodel/wms/LogParam'
 @CustomDialog
 export struct WarehousingLogDialog {
   private scrollerForList: Scroller = new Scroller()

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

@@ -0,0 +1,8 @@
+export interface ConfirmDialogParams {
+  title?: string
+  message: string
+  confirmText?: string
+  cancelText?: string
+  onConfirm: () => void
+}
+

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

@@ -0,0 +1,52 @@
+export interface OrderParams {
+  orderName: string,
+  orderNo: string,
+  date: string,
+  progress: string
+}
+
+export class DemandMaterial{
+  materialName?: string
+  materialType?: string
+  inBoundNum?: number
+  planNum?: number
+}
+
+export interface MaterialItem {
+  id: string;          // 唯一标识
+  name: string;        // 物料名称
+  model: string;       // 产品型号
+  completed: number;   // 已入库数量
+  planned: number;     // 计划数量
+}
+export interface MaterialBox {
+  id: string;
+  type: 'material' | 'empty';  // 区分物料箱/空箱
+  name: string;               // 物料名称/空箱
+  boxNumber: string;          // LX-12345
+  boxType: string;            // 通用类型
+  order?: string;             // 所属订单（空箱没有）
+  quantity?: number;          // 数量（空箱没有）
+  position: string;           // X-1 Y-2
+}
+
+export interface BoundOrder{
+  batchCode: string;
+  materialName: string;
+  materialNo: string
+  num: number;
+  created: string;
+}
+
+export interface EmptyBox {
+  position: string
+}
+
+export interface ConfirmDialogParams {
+  title?: string
+  message: string
+  confirmText?: string
+  cancelText?: string
+  onConfirm: () => void
+}
+

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

@@ -0,0 +1,4 @@
+export interface OutBoxClass {
+  orderId?: string
+  orderType?: string
+}