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

@@ -13,8 +13,8 @@ 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.4:8079/" //chuangke
+// const baseUrl = "http://192.168.1.3:8079"//huajing
+const baseUrl = "http://192.168.1.246:30010" //chuangke
 const DEBUG = true //
 
 // 创建实例

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

@@ -1,6 +1,3 @@
-/*
- * 工序齐套
- * */
 import { TimeAndTitle } from '../component/TimeAndTitle'
 import router from '@ohos.router'
 import { NavigationBar } from '../component/NavigationBar'
@@ -15,11 +12,13 @@ import WmsRequest from '../common/util/request/WmsRequest'
 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 "../viewmodel/wms/rgv/RobotsParam"
 import { CommonConfirmDialog, ProcessFlow, RemindDialog } from '../component/OrderMaterialsStorageView'
 import MaterialInfo from '../viewmodel/wms/MaterialInfo'
 
+/*
+ * 工序齐套
+ * */
 @Entry
 @Component
 struct OperationMaterialKit {
@@ -86,8 +85,7 @@ struct OperationMaterialKit {
   callEmptyBoxFun = async () => {
     // todo 拣选工作台上没有料箱才能叫空箱
     console.info('ssss'+this.drawerPositionStatus+'as')
-    if(this.drawerPositionStatus == 0)
-    {
+    if(this.drawerPositionStatus == 0) {
       this.reminds = '抽屉未缩回，请检查后重试'
       this.remindController.open()
       setTimeout(() => {

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

@@ -11,6 +11,7 @@ import DictInfo from '../../viewmodel/DictInfo'
 
 @Component
 export struct OperationMaterialKitOneStep {
+  private scrollerForList: Scroller = new Scroller()
   // 选择的工单
   @Link workOrder: WorkOrderInfo
   // 选中的工序数组
@@ -105,7 +106,7 @@ export struct OperationMaterialKitOneStep {
         .width('100%')
         .justifyContent(FlexAlign.Center)
 
-        List({space: 5}) {
+        List({space: 5, scroller: this.scrollerForList}) {
           ForEach(this.workOrderArray, (item: WorkOrderInfo, index: number) => {
             ListItem() {
               Column() {
@@ -352,7 +353,7 @@ export struct OperationMaterialKitOneStep {
                 })
                 Row().height(this.fixed38px)
               }
-              .height((item.itemList?.length! + 1) * this.fixed52px + this.fixed38px)
+              .height((this.operationMaterialArray.length! + (item.itemList ? item.itemList?.length! : 0)) * this.fixed52px + (this.operationMaterialArray.length - 1) * this.fixed38px)
               .width('92.6%')
               .justifyContent(FlexAlign.Start)
             }