调仓。

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

@@ -89,8 +89,8 @@ struct OutboundStation {
               .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') : '')
+              .fontColor(this.inboundButton === 4 ? $r('app.color.black_90') : $r('app.color.black_60'))
+              .backgroundColor(this.inboundButton === 4 ? $r('app.color.process_divider_white_color') : '')
               .onClick(() => {
                 this.Button = 1
                 this.inboundButton = 4

entry/src/main/ets/pages/WarehouseMap.ets

@@ -98,7 +98,8 @@ export struct WarehouseMap {
   @State storeyNumber: number = -1
   @State private storey: number[] = [6, 5, 4, 3, 2, 1]
   @State private YAxis: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  @State private XAxis: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45]
+  @State private XAxis: number[] =  [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
+  // @State private XAxis: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45]
   @State private XYxis: number[][] = [
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 6, 0, 6, 6],
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 6, 0, 6, 6],
@@ -166,20 +167,25 @@ export struct WarehouseMap {
   getStorageXYData = async () => {
     let result: number[][] = await StorageRequest.post("/api/v1/wms/position/lineInfo/")
 
+
+    console.log("getStorageXYData", JSON.stringify(result))
+
     let doubleArray: number[][] = []
     // let arrOne: number[] = []
     result.forEach((level1) => {
       let arrTwo: number[] = []
 
       level1.forEach((value) => {
-        if (arrTwo.length < 20) {
+        if (arrTwo.length < 18) {
           arrTwo.push(value)
         }
       })
 
       doubleArray.push(arrTwo)
     })
-    // doubleArray.push(arrOne)
+    // doubleArray.push(arrTwo)
+
+    console.log("getStorageXYData", JSON.stringify(doubleArray))
 
     this.XYxis = doubleArray
 
@@ -187,7 +193,7 @@ export struct WarehouseMap {
   }
 
   aboutToAppear(): void {
-    // this.getStorageXYData()
+    this.getStorageXYData()
 
     this.CarPositionHttp().then((res: carPositionClass) => {
 
@@ -324,7 +330,7 @@ export struct WarehouseMap {
           }
           .listDirection(Axis.Horizontal)
           .scrollBar(BarState.Off)
-          .width(px2vp(2000))
+          .width(px2vp(1020))
           .height(px2vp(55))
 
           List({ space: px2vp(1) }) {
@@ -429,7 +435,7 @@ export struct WarehouseMap {
             })
           }
           .scrollBar(BarState.Off)
-        }.width(px2vp(2000))
+        }.width(px2vp(1020))
         .height(px2vp(800))
 
       }

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

@@ -736,6 +736,7 @@ export struct CompleteSet {
           .width(px2vp(608))
           .height(px2vp(80))
           .margin({ bottom: px2vp(20) })
+          .focusable(false)
           .backgroundColor(this.materialGridStatus === 1 ? $r('app.color.green_100') : this.materialGridStatus === 0 ? $r('app.color.Green_20') : '')
           .onClick(() => {
             if (this.materialGridStatus === 1) {