物料流转。

entry/src/main/ets/pages/OutboundStation.ets

@@ -4,6 +4,7 @@ import { Statistics } from '../view/Statistics'
 import { AdjustStorageView } from '../view/storage/AdjustStorageView'
 import { ManualOutbound } from '../view/ManualOutbound'
 import { WarehouseMap } from './WarehouseMap'
+import { MaterialCirculationPage } from './process/MaterialCirculationPage'
 
 /*
  * 出库工位
@@ -80,13 +81,27 @@ struct OutboundStation {
               .onClick(() => {
                 this.inboundButton = 1
               })
-            Text('调仓')
+
+            Text('物料流转')
               .textAlign(TextAlign.Center)
               .borderRadius(px2vp(16))
               .width(px2vp(292))
               .height(px2vp(80))
               .fontWeight(FontWeight.Medium)
               .fontSize(px2vp(24))
+              .fontColor(this.Button === 1 ? $r('app.color.black_90') : $r('app.color.black_60'))
+              .backgroundColor(this.Button === 1 ? $r('app.color.process_divider_white_color') : '')
+              .onClick(() => {
+                this.Button = 1
+                this.inboundButton = 4
+              })
+            Text('调仓')
+              .textAlign(TextAlign.Center)
+              .borderRadius(px2vp(16))
+              .width(px2vp(124))
+              .height(px2vp(80))
+              .fontWeight(FontWeight.Medium)
+              .fontSize(px2vp(24))
               .fontColor(this.inboundButton === 2 ? $r('app.color.black_90') : $r('app.color.black_60'))
               .backgroundColor(this.inboundButton === 2 ? $r('app.color.process_divider_white_color') : '')
               .onClick(() => {
@@ -104,19 +119,6 @@ struct OutboundStation {
               .onClick(() => {
                 this.inboundButton = 3
               })
-            Text('叫车')
-              .textAlign(TextAlign.Center)
-              .borderRadius(px2vp(16))
-              .width(px2vp(124))
-              .height(px2vp(80))
-              .fontWeight(FontWeight.Medium)
-              .fontSize(px2vp(24))
-              .fontColor(this.Button === 1 ? $r('app.color.black_90') : $r('app.color.black_60'))
-              .backgroundColor(this.Button === 1 ? $r('app.color.process_divider_white_color') : '')
-              .onClick(() => {
-                this.Button = 1
-
-              })
 
           }.width(px2vp(1240))
           .borderRadius(px2vp(16))
@@ -160,6 +162,16 @@ struct OutboundStation {
           .width('100%')
           .height('92%')
         }
+        else if (this.warehouseButton === 0 && this.inboundButton === 4) {
+          Column() {
+            //物料流转
+            MaterialCirculationPage()
+          }
+          .margin({ top: $r('app.float.topMargins_20'), bottom: $r('app.float.topMargins_20') })
+          .width('100%')
+          .height('92%')
+        }
+
       }
       .width('100%')
       .height('92%')

entry/src/main/ets/pages/process/MaterialCirculationPage.ets

@@ -2,6 +2,8 @@ import router from '@ohos.router'
 import { ProcessTitleComp } from '../../common/component/ProcessTitleComp'
 import CommonConstants from '../../common/constants/CommonConstants'
 import JGRequest from '../../common/util/request/Request'
+import StorageRequest from '../../common/util/request/StorageRequest'
+import { StationInfoModel } from '../../model/StorageSpace'
 import MaterialInfo from '../../viewmodel/MaterialInfo'
 import RequestParamModel from '../../viewmodel/RequestParamModel'
 
@@ -11,25 +13,33 @@ import RequestParamModel from '../../viewmodel/RequestParamModel'
  * */
 @Entry
 @Component
-struct MaterialCirculationPage {
-
+export struct MaterialCirculationPage {
   @State materialCode: string = ''
   // 扫码后展示的物料
-  @State materialArray: MaterialInfo[] = []
+  @State materialArray: MaterialInfo[] = [{}, {}, {}, {}, {}, {}, {}, {}, {}]
   // 料箱号
   @State materialBoxCode: string = ''
   @State materialBox: MaterialBox = {}
-
   // 终点切换按钮
   @State destinationSwitch: number = 1
-
   @State destinationArray: DestinationInfo[] = []
   // 选中终点
   @State selectDestination: number = 0
+  codeController: TextInputController = new TextInputController()
 
   async aboutToAppear() {
+    this.codeController.stopEditing()
     // 默认展示非仓库
     this.queryDestinationArray(0);
+
+    this.rfidTimer = setInterval(() => {
+      this.rfidInfoIntervalFun()
+    }, 1500)
+
+  }
+
+  aboutToDisappear(): void {
+    clearInterval(this.rfidTimer)
   }
 
   // 查询流转终点（type: 1有仓库  0没有仓库）
@@ -38,13 +48,13 @@ struct MaterialCirculationPage {
   }
 
   // 查询物料信息（type: 1有仓库  0没有仓库）
-   async queryAndDisplayMaterial(materialCode: string) {
+  async queryAndDisplayMaterial(materialCode: string) {
     let result: MaterialInfo = await JGRequest.post("/api/v1/process/circulation/material", {
       label: this.materialCode
     } as RequestParamModel)
-     if (result) {
-       this.materialArray.push(result)
-     }
+    if (result) {
+      this.materialArray.push(result)
+    }
   }
 
   // 扫描料箱弹窗
@@ -59,28 +69,87 @@ struct MaterialCirculationPage {
     // gridCount: 3,
     customStyle: true,
   })
+  // 通过RFID请求读取料箱的信息
+  rfidTimer: number = -1
+  //齐套料箱重量
+  @State BoxWeight: number = 20
+  @State private recentlyRecordObject: StationInfoModel = {}
+  rfidInfoIntervalFun = async () => {
+    let res: StationInfoModel = await StorageRequest.post("api/v1/wms/common/queryStationInfo", {
+      stanCode: CommonConstants.STATION_CODE
+    } as RequestParamModel)
+    this.recentlyRecordObject = res
+
+    if (this.recentlyRecordObject && this.recentlyRecordObject.rfid) {
+      this.BoxWeight = Number(res.weight)
+      this.recentlyRecordObject.weight = this.recentlyRecordObject.weight + 'Kg'
+    }
+
+  }
 
   build() {
     Column() {
       // 顶部栏
-      ProcessTitleComp({titleName: '物料流转'})
+      // ProcessTitleComp({titleName: '物料流转'})
 
       Column() {
         Row() {
           Column() {
-            Row(){
-              Text('料箱绑定')
-                .fontSize($r('app.float.fontSize_38'))
-                .fontWeight(FontWeight.Medium)
-                .fontColor($r('app.color.general_font_color'))
-                .opacity($r('app.float.general_font_opacity'))
-            }
-            .height('8%')
-            .width('100%')
-            .justifyContent(FlexAlign.Start)
-            .padding({left: '2%'})
-
             Row() {
+              Stack() {
+                Image(this.BoxWeight === 0 ? $r('app.media.no_material_box') : this.BoxWeight <= 15 && this.BoxWeight !== 0 ? $r('app.media.normal_box') : $r('app.media.overweight_box'))
+                  .width(px2vp(608))
+                  .height(px2vp(220))
+                  .borderRadius(px2vp(16))
+                Column() {
+                  Text('料箱重量')
+                    .textAlign(TextAlign.End)
+                    .width('48%')
+                    .height('20%')
+                    .fontWeight(FontWeight.Regular)
+                    .fontSize($r('app.float.fontSize_20'))
+                    .fontColor($r('app.color.process_nameplate_grey_color'))
+
+                  Text(this.recentlyRecordObject.weight)
+                    .textAlign(TextAlign.End)
+                    .width('48%')
+                    .height('25%')
+                    .fontWeight(FontWeight.Regular)
+                    .fontSize($r('app.float.fontSize_24'))
+                    .fontColor(this.BoxWeight <= 15 ? $r('app.color.black_90') : $r('app.color.brown_100'))
+
+                  Blank()
+                  Text('料箱ID')
+                    .textAlign(TextAlign.End)
+                    .width('48%')
+                    .height('20%')
+                    .fontWeight(FontWeight.Regular)
+                    .fontSize($r('app.float.fontSize_20'))
+                    .fontColor($r('app.color.process_nameplate_grey_color'))
+                    .focusable(true)
+                    .defaultFocus(false)
+                  Text(this.recentlyRecordObject.rfid)
+                    .textAlign(TextAlign.End)
+                    .width('100%')
+                    .height('25%')
+                    .fontWeight(FontWeight.Regular)
+                    .fontSize($r('app.float.fontSize_24'))
+                    .fontColor($r('app.color.black_90'))
+                }
+                .width(px2vp(608))
+                .height(px2vp(220))
+                .borderRadius(px2vp(16))
+                .padding({ right: $r('app.float.borderRadius_16') })
+                .alignItems(HorizontalAlign.End)
+
+              }
+              .width(px2vp(608))
+              .height('100%')
+              .border({ width: 2, color: Color.Yellow })
+
+              Row() {
+              }.width('2%')
+
               Row() {
                 Row() {
                   Image($r('app.media.qr_code'))
@@ -89,9 +158,10 @@ struct MaterialCirculationPage {
                 .width('8%')
                 .justifyContent(FlexAlign.End)
 
+
                 TextInput({ placeholder: '请扫描物料编码' })
                   .placeholderColor($r('app.color.text_input_placeholder_font_color'))
-                  .placeholderFont({size: $r('app.float.process_card_middle_font_size'), weight: FontWeight.Medium})
+                  .placeholderFont({ size: $r('app.float.process_card_middle_font_size'), weight: FontWeight.Medium })
                   .fontSize($r('app.float.process_card_middle_font_size'))
                   .fontWeight(FontWeight.Medium)
                   .fontColor($r('app.color.general_font_color'))
@@ -110,118 +180,85 @@ struct MaterialCirculationPage {
               }
               .borderRadius($r('app.float.robot_set_radius'))
               .backgroundColor($r('app.color.general_font_white_color'))
-              .width('47%')
-              .height('100%')
-              Row() {
-                if (this.materialBoxCode && this.materialBoxCode.length > 0) {
-                  Text('当前料箱')
-                    .fontSize($r('app.float.robot_set_font_size'))
-                    .fontWeight(FontWeight.Medium)
-                    .fontColor($r('app.color.general_font_color'))
-                    .opacity($r('app.float.process_step_font_opacity'))
-                    .textAlign(TextAlign.Start)
-                    .width('20%')
-                    .padding({ left: 10})
-                  Text(this.materialBoxCode)
-                    .fontSize($r('app.float.robot_set_font_size'))
-                    .fontWeight(FontWeight.Medium)
-                    .fontColor($r('app.color.general_font_color'))
-                    .opacity($r('app.float.general_font_opacity'))
-                    .textAlign(TextAlign.End)
-                    .width('80%')
-                    .padding({ right: 10})
-                } else {
-                  Text('点击扫描物料箱')
-                    .fontSize($r('app.float.robot_set_font_size'))
-                    .fontWeight(FontWeight.Medium)
-                    .fontColor($r('app.color.general_font_white_color'))
-                    .textAlign(TextAlign.Center)
-                    .width('100%')
-                }
-              }
-              .width('47%')
-              .height('100%')
-              .backgroundColor(this.materialBoxCode && this.materialBoxCode.length > 0 ? $r('app.color.robot_set_coord_card_grey') : $r('app.color.robot_set_card_blue'))
-              .borderRadius($r('app.float.general_border_radius'))
-              .onClick(()=>{
-                this.materialBoxController.open()
-              })
+              .layoutWeight(1)
+              .height('30%')
+
             }
-            .height('10%')
+            .height(px2vp(220))
             .width('100%')
-            .justifyContent(FlexAlign.SpaceEvenly)
+            .justifyContent(FlexAlign.Start)
+            .alignItems(VerticalAlign.Top)
+            .border({ width: 2, color: Color.Blue })
 
-            Flex({ wrap: FlexWrap.Wrap}) {
+            List({ space: 8 }) {
               ForEach(this.materialArray, (item: MaterialInfo, index: number) => {
-                Row().width('2%')
-                Column() {
+                ListItem() {
                   Column() {
-                    Text(item.materialName)
-                      .fontSize($r('app.float.process_card_middle_font_size'))
-                      .fontWeight(FontWeight.Medium)
-                      .fontColor($r('app.color.general_font_color'))
-                      .opacity($r('app.float.general_font_opacity'))
-                    Text(item.materialCode && item.materialCode.length > 0 ? item.materialCode : item.batchCode)
-                      .fontSize($r('app.float.fontSize_24'))
-                      .fontColor($r('app.color.general_font_color'))
-                      .opacity($r('app.float.process_step_font_opacity'))
-                      .fontWeight(FontWeight.Regular)
-                  }
-                  .height('50%')
-                  .justifyContent(FlexAlign.End)
-                  .alignItems(HorizontalAlign.Start)
-                  .padding({left: 14})
+                    Column() {
+                      Text(item.materialName)
+                        .fontSize($r('app.float.process_card_middle_font_size'))
+                        .fontWeight(FontWeight.Medium)
+                        .fontColor($r('app.color.general_font_color'))
+                        .opacity($r('app.float.general_font_opacity'))
+                      Text(item.materialCode && item.materialCode.length > 0 ? item.materialCode : item.batchCode)
+                        .fontSize($r('app.float.fontSize_24'))
+                        .fontColor($r('app.color.general_font_color'))
+                        .opacity($r('app.float.process_step_font_opacity'))
+                        .fontWeight(FontWeight.Regular)
+                    }
+                    .height('50%')
+                    .justifyContent(FlexAlign.End)
+                    .alignItems(HorizontalAlign.Start)
+                    .padding({ left: 14 })
 
-                  Row() {
-                    Text(item.num?.toString())
-                      .fontSize($r('app.float.process_card_large_font_size'))
-                      .fontColor($r('app.color.general_font_color'))
-                      .opacity($r('app.float.general_font_opacity'))
-                      .fontWeight(FontWeight.Bold)
-                    Text('个')
-                      .fontSize($r('app.float.fontSize_24'))
-                      .fontColor($r('app.color.general_font_color'))
-                      .opacity($r('app.float.process_step_font_opacity'))
-                      .fontWeight(FontWeight.Medium)
-                  }
-                  .layoutWeight(1)
-                  .padding({left: 14})
-                  .alignItems(VerticalAlign.Bottom)
-                  Row() {
-                    Image($r('app.media.subscript'))
-                      .height($r('app.float.card_subscript_size'))
-                      .width($r('app.float.card_subscript_size'))
+                    Row() {
+                      Text(item.num?.toString())
+                        .fontSize($r('app.float.process_card_large_font_size'))
+                        .fontColor($r('app.color.general_font_color'))
+                        .opacity($r('app.float.general_font_opacity'))
+                        .fontWeight(FontWeight.Bold)
+                      Text('个')
+                        .fontSize($r('app.float.fontSize_24'))
+                        .fontColor($r('app.color.general_font_color'))
+                        .opacity($r('app.float.process_step_font_opacity'))
+                        .fontWeight(FontWeight.Medium)
+                    }
+                    .layoutWeight(1)
+                    .padding({ left: 14 })
+                    .alignItems(VerticalAlign.Bottom)
+
+                    Row() {
+                      Image($r('app.media.subscript'))
+                        .height($r('app.float.card_subscript_size'))
+                        .width($r('app.float.card_subscript_size'))
+                    }
+                    .width('100%')
+                    .height('23%')
+                    .justifyContent(FlexAlign.End)
+                    .alignItems(VerticalAlign.Center)
+                    .padding({ right: 10 })
                   }
+                  .height('25.6%')
                   .width('100%')
-                  .height('23%')
-                  .justifyContent(FlexAlign.End)
-                  .alignItems(VerticalAlign.Center)
-                  .padding({right: 10})
-                }
-                .height('25.6%')
-                .width('47%')
-                .justifyContent(FlexAlign.Center)
-                .alignItems(HorizontalAlign.Start)
-                .borderRadius($r('app.float.general_border_radius'))
-                .backgroundColor($r('app.color.general_font_white_color'))
-                .onClick(()=>{
-                  // this.bindConfirmController.open()
-                })
-                .margin({ bottom: 10})
-                if ((index + 1) % 2 === 0) {
-                  Row().width('2%')
+                  .justifyContent(FlexAlign.Center)
+                  .alignItems(HorizontalAlign.Start)
+                  .borderRadius($r('app.float.general_border_radius'))
+                  .backgroundColor($r('app.color.general_font_white_color'))
                 }
               })
             }
+            .lanes(2, 8)
             .width('100%')
-            .padding({top: 10})
+            .padding({ top: 10 })
             .layoutWeight(1)
+            .border({ width: 2, color: Color.Black })
           }
           .width('67.5%')
           .justifyContent(FlexAlign.Start)
+          .border({ width: 2, color: Color.Red })
 
           Column() {
-            Row(){
+            Row() {
               Text('流转终点')
                 .fontSize($r('app.float.fontSize_24'))
                 .fontWeight(FontWeight.Medium)
@@ -231,66 +268,11 @@ struct MaterialCirculationPage {
             .height('8%')
             .width('100%')
             .justifyContent(FlexAlign.Start)
-            .padding({left: '3.7%'})
-            Row() {
-              Row() {
-                Stack() {
-                  if (this.destinationSwitch === 1) {
-                    Text()
-                      .backgroundColor($r('app.color.general_card_background_color'))
-                      .width('100%')
-                      .height('100%')
-                      .borderRadius($r('app.float.general_border_radius'))
-                  }
-                  Text('终点')
-                    .fontSize($r('app.float.set_card_font_size'))
-                    .fontColor($r('app.color.general_font_color'))
-                    .fontWeight(FontWeight.Medium)
-                    .opacity(this.destinationSwitch === 1 ? $r('app.float.card_font_select_opacity') : $r('app.float.card_font_default_opacity'))
-                }
-                .width('100%')
-                .height('100%')
-              }
-              .onClick(async () => {
-                if (this.destinationSwitch != 1) {
-                  this.queryDestinationArray(0)
-                }
-                this.destinationSwitch = 1
-              })
-              .width('50%')
-              Row() {
-                Stack() {
-                  if (this.destinationSwitch === 2) {
-                    Text()
-                      .backgroundColor($r('app.color.general_card_background_color'))
-                      .width('100%')
-                      .height('100%')
-                      .borderRadius($r('app.float.general_border_radius'))
-                  }
-                  Text('立库暂存')
-                    .fontSize($r('app.float.set_card_font_size'))
-                    .fontColor($r('app.color.general_font_color'))
-                    .fontWeight(FontWeight.Medium)
-                    .opacity(this.destinationSwitch === 2 ? $r('app.float.card_font_select_opacity') : $r('app.float.card_font_default_opacity'))
-                }
-                .width('100%')
-                .height('100%')
-              }
-              .width('50%')
-              .onClick(() => {
-                if (this.destinationSwitch != 2) {
-                  this.queryDestinationArray(1)
-                }
-                this.destinationSwitch = 2
-              })
-            }
-            .width('92.6%')
-            .height('10%')
-            .borderRadius($r('app.float.general_border_radius'))
-            .backgroundColor($r('app.color.robot_toward_set_card_background'))
-            .margin({bottom: 10})
-            List({space: 10}) {
-              ForEach(this.destinationArray, (item: DestinationInfo, index: number)=>{
+            .padding({ left: '3.7%' })
+
+
+            List({ space: 10 }) {
+              ForEach(this.destinationArray, (item: DestinationInfo, index: number) => {
                 ListItem() {
                   Row() {
                     Text(item.name ? item.name : '')
@@ -298,7 +280,7 @@ struct MaterialCirculationPage {
                       .fontWeight(FontWeight.Medium)
                       .fontColor($r('app.color.general_font_color'))
                       .opacity($r('app.float.general_font_opacity'))
-                      .padding({left: 14})
+                      .padding({ left: 14 })
                   }
                   .width('92.6%')
                   .height('15%')
@@ -321,8 +303,9 @@ struct MaterialCirculationPage {
         .width('100%')
         .layoutWeight(1)
 
+
         Row() {
-          Button('取消')
+          Button('清空')
             .fontSize($r('app.float.robot_set_font_size'))
             .fontWeight(FontWeight.Medium)
             .fontColor($r('app.color.robot_set_card_blue'))
@@ -331,7 +314,7 @@ struct MaterialCirculationPage {
             .borderRadius($r('app.float.robot_set_radius'))
             .backgroundColor($r('app.color.robot_set_coord_card_grey'))
             .onClick(() => {
-              router.back()
+
             })
           Row()
             .width('1.25%')
@@ -349,15 +332,15 @@ struct MaterialCirculationPage {
               // }
 
               // 添加流转
-              await JGRequest.post('/api/v1/process/circulation/add', {
-                circulationDetail: this.materialArray,
-                houseNo: this.destinationArray[this.selectDestination].houseNo,
-                stationId: CommonConstants.STATION_ID,
-                targetType: this.destinationArray[this.selectDestination].targetType,
-                vehicleCode: this.materialBox.code,
-                vehicleId: Number.parseInt(this.materialBox.id),
-                vehicleName: this.materialBox.name
-              } as RequestParamModel)
+              // await JGRequest.post('/api/v1/process/circulation/add', {
+              //   circulationDetail: this.materialArray,
+              //   houseNo: this.destinationArray[this.selectDestination].houseNo,
+              //   stationId: CommonConstants.STATION_ID,
+              //   targetType: this.destinationArray[this.selectDestination].targetType,
+              //   vehicleCode: this.materialBox.code,
+              //   vehicleId: Number.parseInt(this.materialBox.id),
+              //   vehicleName: this.materialBox.name
+              // } as RequestParamModel)
             })
         }
         .justifyContent(FlexAlign.Center)
@@ -367,7 +350,7 @@ struct MaterialCirculationPage {
       }
       .backgroundColor($r('app.color.page_general_background'))
       .width('100%')
-      .height('92%')
+      .height('100%')
     }
     .width('100%')
     .height('100%')
@@ -377,13 +360,15 @@ struct MaterialCirculationPage {
 @CustomDialog
 struct MaterialBoxDialog {
   // 输入或扫描的料箱号
-  private boxCode: string=''
+  private boxCode: string = ''
   // 确认的料箱
   @Link materialBoxCode: string
   @Link materialBox: MaterialBox
   controller?: CustomDialogController
-  cancel: () => void = () => {}
-  confirm: () => void = () => {}
+  cancel: () => void = () => {
+  }
+  confirm: () => void = () => {
+  }
 
   build() {
     Column() {
@@ -409,7 +394,7 @@ struct MaterialBoxDialog {
 
           TextInput({ placeholder: '请扫描物料编码', text: this.boxCode })
             .placeholderColor($r('app.color.text_input_placeholder_font_color'))
-            .placeholderFont({size: $r('app.float.robot_set_font_size'), weight: FontWeight.Medium})
+            .placeholderFont({ size: $r('app.float.robot_set_font_size'), weight: FontWeight.Medium })
             .fontSize($r('app.float.robot_set_font_size'))
             .fontWeight(FontWeight.Medium)
             .fontColor($r('app.color.general_font_color'))
@@ -436,6 +421,7 @@ struct MaterialBoxDialog {
       .justifyContent(FlexAlign.Center)
       .height('54%')
       .alignItems(VerticalAlign.Center)
+
       Blank()
     }
     .width('48%')
@@ -448,7 +434,7 @@ struct MaterialBoxDialog {
 
 class DestinationInfo {
   // 仓库编号
-  houseNo?:	string
+  houseNo?: string
   // 生产过程id
   id?: number
   // 目的地名称
@@ -459,19 +445,19 @@ class DestinationInfo {
 
 class MaterialBox {
   // 创建时间
-  created?:	string
+  created?: string
   // 创建人
-  creator?:	string
+  creator?: string
   // 是否删除
-  deleted?:	number
+  deleted?: number
   // 部门ID
   deptId?: string
   // 主键
   id?: string
   // 组织ID
-  orgId?:	string
+  orgId?: string
   // 修改时间
-  updated?:	string
+  updated?: string
   // 上次修改人
   updator?: string
   // 容量

entry/src/main/ets/view/CompleteSet.ets

@@ -130,13 +130,9 @@ export struct CompleteSet {
     this.materialGridStatus = 0
     if (this.recentlyRecordObject && this.recentlyRecordObject.rfid) {
       this.materialGridStatus = 1
-      if (this.recentlyRecordObject.weight) {
-        this.recentlyRecordObject.weight = this.recentlyRecordObject.weight + 'Kg'
-      }
-      else {
-        this.recentlyRecordObject.weight = '0 Kg'
+      this.BoxWeight = Number(res.weight)
+      this.recentlyRecordObject.weight = this.recentlyRecordObject.weight + 'Kg'
 
-      }
     }
   }
   //扫码请求
@@ -175,7 +171,7 @@ export struct CompleteSet {
   async aboutToAppear() {
     this.rfidTimer = setInterval(() => {
       this.rfidInfoIntervalFun()
-    }, 1000)
+    }, 1500)
 
     // 查询订单数据
     let res = await this.queryOrderPage()

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

@@ -50,7 +50,7 @@ export default class RequestParamModel {
   processUserReportList?: RequestParamModel[]
   accessoriesType?: string
   label?: string
-  circulationDetail?: MaterialInfo[]
+  circulationDetail?: MaterialInformationList[]
   houseNo?: string
   targetType?: string
   vehicleCode?: string