Merge remote-tracking branch 'origin/master'

entry/src/main/ets/pages/LittleMaterialOutBound.ets

@@ -60,7 +60,7 @@ struct LittleMaterialsOutBound {
 
   // 根据物料编码【模糊】查询库存
   getStoreListFunc = async () => {
-    let res: MaterialBoxInfo[] = await WmsRequest.post('/api/v1/stock/list', {
+    let res: MaterialBoxInfo[] = await WmsRequest.post('/api/v1/stock/mergeList', {
       houseType: '1',
       materialNo: this.inputValue
     } as RequestParamModel)
@@ -415,74 +415,70 @@ struct LittleMaterialsOutBound {
               .height('10%')
               .width('100%')
               .justifyContent(FlexAlign.Center)
-              Row() {
-                // 动态排列容器
-                Scroll() {
-                  Flex({ wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) {
-                    ForEach(this.materialBoxInfos, (item: MaterialBoxInfo, index: number) => {
-                      Column({ space: 5 }) {
-                        Row() {
-                          Text(item.materials?.[0]?.materialName! + '-' + item.materials?.[0]?.materialNo!)
-                            .fontSize($r('app.float.fontSize_24'))
-                            .fontWeight(FontWeight.Medium)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                        }
-                        .height('28.5%')
-                        .width('87.4%')
-                        .alignItems(VerticalAlign.Bottom)
+              // 动态排列容器
+              Scroll() {
+                Flex({ wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start}) {
+                  ForEach(this.materialBoxInfos, (item: MaterialBoxInfo, index: number) => {
+                    Column({ space: 5 }) {
+                      Row() {
+                        Text(item.materials?.[0]?.materialName! + '-' + item.materials?.[0]?.materialNo!)
+                          .fontSize($r('app.float.fontSize_24'))
+                          .fontWeight(FontWeight.Medium)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
+                      }
+                      .height('28.5%')
+                      .width('87.4%')
+                      .alignItems(VerticalAlign.Bottom)
 
-                        Column() {
-                          Text('料箱编号：' + item.vehicleCode!)
-                            .fontSize($r('app.float.fontSize_16'))
-                            .fontWeight(FontWeight.Lighter)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                          Text('料箱类型：' + (this.vehicleTypeDictMap.get(item.vehicleCategory!) ? this.vehicleTypeDictMap.get(item.vehicleCategory!) : item.vehicleCategory!))
-                            .fontSize($r('app.float.fontSize_16'))
-                            .fontWeight(FontWeight.Lighter)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                          Text('所属订单：')
-                            .fontSize($r('app.float.fontSize_16'))
-                            .fontWeight(FontWeight.Lighter)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                          Text('数量：' + item.materials?.[0]?.num! + item.materials?.[0].unit!)
-                            .fontSize($r('app.float.fontSize_16'))
-                            .fontWeight(FontWeight.Lighter)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                          Text('位置：X-' + item.x! + ' Y-' + item.y!)
-                            .fontSize($r('app.float.fontSize_16'))
-                            .fontWeight(FontWeight.Lighter)
-                            .fontColor($r('app.color.FFFFFF'))
-                            .maxLines(1)
-                        }
-                        .height('48.3%')
-                        .width('87.4%')
-                        .justifyContent(FlexAlign.Center)
-                        .alignItems(HorizontalAlign.Start)
+                      Column() {
+                        Text('料箱编号：' + item.vehicleCode!)
+                          .fontSize($r('app.float.fontSize_16'))
+                          .fontWeight(FontWeight.Lighter)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
+                        Text('料箱类型：' + (this.vehicleTypeDictMap.get(item.vehicleCategory!) ? this.vehicleTypeDictMap.get(item.vehicleCategory!) : item.vehicleCategory!))
+                          .fontSize($r('app.float.fontSize_16'))
+                          .fontWeight(FontWeight.Lighter)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
+                        Text('所属订单：')
+                          .fontSize($r('app.float.fontSize_16'))
+                          .fontWeight(FontWeight.Lighter)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
+                        Text('数量：' + item.materials?.[0]?.num! + item.materials?.[0].unit!)
+                          .fontSize($r('app.float.fontSize_16'))
+                          .fontWeight(FontWeight.Lighter)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
+                        Text('位置：X-' + item.x! + ' Y-' + item.y!)
+                          .fontSize($r('app.float.fontSize_16'))
+                          .fontWeight(FontWeight.Lighter)
+                          .fontColor($r('app.color.FFFFFF'))
+                          .maxLines(1)
                       }
-                      .width('32.8%')
-                      .height('23%')
-                      .borderRadius($r('app.float.virtualSize_16'))
-                      .backgroundColor(this.selectVehicleIndex === index ? $r('app.color.2030D158') : $r('app.color.20FFFFFF'))
-                      .borderWidth(1)
-                      .borderColor(this.selectVehicleIndex === index ? $r('app.color.30D158') : $r('app.color.20FFFFFF'))
-                      .margin({ top: index > 2 ? '1%' : '0%', left: (index % 3) === 0 ? '0%' : '0.8%' })
-                      .onClick(()=>{
-                        this.selectVehicleIndex = index
-                      })
+                      .height('48.3%')
+                      .width('87.4%')
+                      .justifyContent(FlexAlign.Center)
+                      .alignItems(HorizontalAlign.Start)
+                    }
+                    .width('32.8%')
+                    .height('23%')
+                    .borderRadius($r('app.float.virtualSize_16'))
+                    .backgroundColor(this.selectVehicleIndex === index ? $r('app.color.2030D158') : $r('app.color.20FFFFFF'))
+                    .borderWidth(1)
+                    .borderColor(this.selectVehicleIndex === index ? $r('app.color.30D158') : $r('app.color.20FFFFFF'))
+                    .margin({ top: index > 2 ? '1%' : '0%', left: (index % 3) === 0 ? '0%' : '0.8%' })
+                    .onClick(()=>{
+                      this.selectVehicleIndex = index
                     })
-                  }
+                  })
                 }
-                .scrollable(ScrollDirection.Vertical) // 垂直滚动
-                .scrollBar(BarState.Auto)
-                .width('96.6%')
-                .height('87%')
               }
-              .width('100%')
+              .scrollable(ScrollDirection.Vertical) // 垂直滚动
+              .scrollBar(BarState.Auto)
+              .width('96.6%')
               .height('87.4%')
             }
             .height('100%')