参数放到viewModel2

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

@@ -9,7 +9,7 @@ import CommonConstants from '../common/constants/CommonConstants'
 import {RemindDialog} from "../component/OrderMaterialsStorageView"
 import WmsRequest from '../common/util/request/WmsRequest'
 import {CommonConfirmDialog}from "../component/OrderMaterialsStorageView"
-import {ConfirmDialogParams} from "../params/OrderMaterialsStorageParams"
+import {ConfirmDialogParams} from "../viewmodel/wms/ConfirmDialogParam"
 import MaterialBoxInfo from '../viewmodel/wms/MaterialBoxInfo';
 import MaterialInfo from '../viewmodel/wms/MaterialInfo';
 

entry/src/main/ets/component/MenuView.ets

@@ -1,4 +1,4 @@
-import { BoundOrder} from "../params/OrderMaterialsStorageParams"
+import { BoundOrder} from "../viewmodel/wms/OrderMaterialsStorageParams"
 
 @Component
 export struct StorageList {

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

@@ -1,4 +1,3 @@
-import {MaterialBox,EmptyBox} from "../params/OrderMaterialsStorageParams"
 import WorkOrderInfo from '../viewmodel/wms/WorkOrderInfo'
 import WorkOrderMaterialInfo from "../viewmodel/wms/WorkOrderMaterialInfo"
 import WmsRequest from '../common/util/request/WmsRequest'

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

@@ -6,7 +6,7 @@ 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 {ConfirmDialogParams} from "../viewmodel/wms/ConfirmDialogParam"
 import CommonConstants from '../common/constants/CommonConstants'
 import WmsRequest from '../common/util/request/WmsRequest'
 import {RgvInfo} from "../viewmodel/wms/rgv/RobotsParam"

entry/src/main/ets/pages/Menu.ets

@@ -1,7 +1,7 @@
 import {TimeAndTitle} from "../component/TimeAndTitle"
 import {NavigationBar} from '../component/NavigationBar'
 import {StorageList} from '../component/MenuView'
-import {BoundOrder} from '../params/OrderMaterialsStorageParams'
+import { BoundOrder} from "../viewmodel/wms/OrderMaterialsStorageParams"
 import RequestParamModel from '../viewmodel/wms/RequestParamModel'
 import WmsRequest from '../common/util/request/WmsRequest'
 import PageRes from "../viewmodel/wms/InBoundOrderInfo"

entry/src/main/ets/params/OrderMaterialsStorageParams.ets

@@ -1,52 +0,0 @@
-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/view/wms/OrderMaterialStorageSecondStep.ets

@@ -7,7 +7,7 @@ import CommonConstants from '../../common/constants/CommonConstants'
 import {RgvInfo} from "../../viewmodel/wms/rgv/RobotsParam"
 import {CommonConfirmDialog}from "../../component/OrderMaterialsStorageView"
 import {OutBoxClass} from '../../viewmodel/wms/OutBoxClass'
-import {ConfirmDialogParams} from "../../params/OrderMaterialsStorageParams"
+import {ConfirmDialogParams} from "../../viewmodel/wms/ConfirmDialogParam"
 import RobotErrorHandleRequest from '../../common/util/request/RobotErrorHandleRequest'
 import MaterialBoxInfo from '../../viewmodel/wms/MaterialBoxInfo'
 import MaterialInfo from '../../viewmodel/wms/MaterialInfo'

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

@@ -1,10 +1,3 @@
-export interface OrderParams {
-  orderName: string,
-  orderNo: string,
-  date: string,
-  progress: string
-}
-
 export class DemandMaterial{
   materialName?: string
   materialType?: string
@@ -12,24 +5,6 @@ export class DemandMaterial{
   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;
@@ -37,16 +12,3 @@ export interface BoundOrder{
   num: number;
   created: string;
 }
-
-export interface EmptyBox {
-  position: string
-}
-
-export interface ConfirmDialogParams {
-  title?: string
-  message: string
-  confirmText?: string
-  cancelText?: string
-  onConfirm: () => void
-}
-