修改

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

@@ -49,6 +49,18 @@ export default class CommonConstants {
     {
       id: 1,
       robotCode: 'rgv1',
+      robotNo:'RGV-001',
+      storageId: 1,
+      robotType: 2,
+      robotToward: 2,
+      x: 1,
+      y: 1,
+      lastSelfCheck: '2024/02/16 11:11:34'
+    } as RobotInfo,
+    {
+      id: 2,
+      robotCode: 'rgv2',
+      robotNo:'RGV-002',
       storageId: 1,
       robotType: 2,
       robotToward: 2,

entry/src/main/ets/common/util/mqtt.ets

@@ -101,7 +101,6 @@ class MqttManager {
 
   public async connect(options: MqttConnectOptions): Promise<boolean> {
     if (!this.client) return false;
-
     try {
       const res = await this.client.connect(options);
       if (res.code === 0) {

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/component/NavigationBar.ets

@@ -161,7 +161,6 @@ export struct NavigationBar {
 }
 
 
-// 确认框
 @CustomDialog
 export struct InAndOutBoundDialog {
   @State materialNum: number=0

entry/src/main/ets/component/RgvControlView.ets

@@ -1,3 +1,4 @@
+import promptAction from '@ohos.promptAction'
 
 @Component
 export struct InfoRow {
@@ -248,8 +249,8 @@ export struct CommonConfirmDialog {
 // 设置目标位置弹框
 @CustomDialog
 export struct MoveDialog {
-  @Link rgvEndX: number
-  @Link rgvEndY: number
+  @Link rgvEndX: string
+  @Link rgvEndY: string
   @Prop title : string = ''
   @Prop info : string = ''
   controller: CustomDialogController
@@ -294,11 +295,16 @@ export struct MoveDialog {
             .fontSize($r('app.float.fontSize_30'))
             .fontColor($r('app.color.FFFFFF'))
             .type(InputType.Number)
-            .maxLength(2)
+            .maxLength(1)
             .onChange((value: string) => {
               let num = Number(value);
-              num = Math.max(1, Math.min(num, 9));
-              this.rgvEndX = num;
+              if(value)
+              {
+                num = Math.max(1, Math.min(num, 9));
+                this.rgvEndX = String(num);
+              }else{
+                this.rgvEndX = ''
+              }
             })
         }
         .backgroundColor($r('app.color.000000'))
@@ -329,8 +335,13 @@ export struct MoveDialog {
             .maxLength(2)
             .onChange((value: string) => {
               let num = Number(value);
-              num = Math.max(1, Math.min(num, 13));
-              this.rgvEndY = num;
+              if(value)
+              {
+                num = Math.max(1, Math.min(num, 13));
+                this.rgvEndY = String(num);
+              }else{
+                this.rgvEndY = ''
+              }
             })
         }
         .width('70%')
@@ -355,7 +366,11 @@ export struct MoveDialog {
           }
           .justifyContent(FlexAlign.Center)
           .width('50%')
-          .onClick(() => this.controller.close())
+          .onClick(() => {
+            this.rgvEndX = ''
+            this.rgvEndY = ''
+            this.controller.close()
+          })
           Divider()
             .vertical(true)
             .strokeWidth(1)
@@ -368,8 +383,18 @@ export struct MoveDialog {
           .justifyContent(FlexAlign.Center)
           .width('50%')
           .onClick(() => {
+            if(this.rgvEndX==''||this.rgvEndY=='')
+            {
+              promptAction.showToast({
+                message: 'X轴或Y轴坐标不能为空',
+                duration: 2000
+              });
+              return
+            }
             this.onConfirm();
             this.controller.close();
+            this.rgvEndX = ''
+            this.rgvEndY = ''
           })
         }
       }

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

@@ -149,15 +149,19 @@ struct menu {
     const checkInterval = setInterval(() => {
       if (CommonConstants.AUTH_TOKEN!='') {
         clearInterval(checkInterval);  // 停止轮询
-        setTimeout(() => {
-          this.connectMQTT();
-        }, 1000);
         return
       }
       this.loginWms();
     }, 2000); // 每500毫秒检查一次
+    const checkInterval2 = setInterval(() => {
+      if (this.isConnected) {
+        clearInterval(checkInterval2); // 停止轮询
+        return
+      }
+        this.connectMQTT()
+    }, 1000);
 
-   // this.loginWms();
+    // this.loginWms();
 
     // 查询数据字典放到CommonConstants的DICT_DATA变量中
     // let res: DictInfo[] = await WmsRequest.post('/api/v1/sys/dictData/all',)

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/pages/RgvControl.ets

@@ -25,14 +25,14 @@ struct RgvControl {
   @State currentStep: number = 1;
   @State selectWorkOrder: WorkOrderInfo = {}
   @State workOrderArray: WorkOrderInfo[] = []
-
+  @State hangingText:string = '原位'
   @State cleanErrorClick: number = 1;
   @State cleanTaskClick: number = 1;
   @State selectRobotIndex : number = 0
   @State axisNumberX : number = 0
   @State axisNumberY : number = 0
-  @State rgvEndX : number = 0
-  @State rgvEndY : number = 0
+  @State rgvEndX : string = ''
+  @State rgvEndY : string = ''
   @State rgvPosition : string = ""
   @State rgvBatteryLevel  : string = ""
   @State rgvCurrentStatus: string = ""
@@ -233,8 +233,8 @@ struct RgvControl {
     try {
       let res: object = await RobotErrorHandleRequest.post('/api/v1/wcs/rgv/movergv', {
         rgvNo: this.robotsList[this.selectRobotIndex].robotCode,
-        destX: this.rgvEndX.toString(),
-        destY: this.rgvEndY.toString()
+        destX: this.rgvEndX,
+        destY: this.rgvEndY
       } as RequestParam)
       console.log(TAG,'终点移动位置：' + res.toString())
     } catch (error) {
@@ -247,8 +247,8 @@ struct RgvControl {
     try {
       let res: object = await RobotErrorHandleRequest.post('/api/v1/wcs/rgv/newposition', {
         rgvNo: this.robotsList[this.selectRobotIndex].robotCode,
-        x: this.rgvEndX.toString(),
-        y: this.rgvEndY.toString()
+        x: this.rgvEndX,
+        y: this.rgvEndY
       } as RequestParam)
     } catch (error) {
       console.error(TAG,'终点移动位置：', error);
@@ -497,7 +497,7 @@ struct RgvControl {
                   .onClick(()=>{
                     this.settingPositionDialog.open();
                   })
-                Text('设置小车位置')
+                Text(`设置小车位置`)
                   .fontColor($r('app.color.FFFFFF'))
                   .fontSize($r('app.float.fontSize_16'))
               }
@@ -510,7 +510,7 @@ struct RgvControl {
             Column({space:10}){
               InfoRow({
                 label:"编号：",
-                value:"DF441AS114F5555",
+                value:this.robotsList[this.selectRobotIndex].robotNo,
               })
               InfoRow({
                 label:"状态：",
@@ -784,7 +784,7 @@ struct RgvControl {
               }.height('15%').justifyContent(FlexAlign.End)
               Select(this.hangingHeight)
                 .selected(0)
-                .value(String(this.hangingHeight[0].value))
+                .value(this.hangingText)
                 .height('16%')
                 .width('80%')
                 .borderRadius($r('app.float.virtualSize_16'))
@@ -795,6 +795,7 @@ struct RgvControl {
                   if(index == 7) this.hangingIndex=130
                   else if(index == 8) this.hangingIndex=129
                   else this.hangingIndex = index
+                  this.hangingText = String(this.hangingHeight[index].value)
                 })
               RgvButton({
                 text:`升降`,

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)
             }

entry/src/main/ets/viewmodel/wms/rgv/RobotsParam.ets

@@ -17,6 +17,7 @@ export  class RobotInfo {
   // 上次自检日期
   lastSelfCheck? : string
   robotId?:number
+  robotNo?:string
   checkName?:string
   checkTime?:string
   checkStatus?:number