Ver código fonte

添加物料单位

hh 2 semanas atrás
pai
commit
59c7324254

+ 5 - 5
entry/src/main/ets/pages/LittleMaterialOutBound.ets

@@ -366,7 +366,7 @@ struct LittleMaterialsOutBound {
                           .fontColor($r('app.color.FFFFFF'))
                           .maxLines(1)
 
-                        Text('库存数量:' + item.num!)
+                        Text('库存数量:' + item.num! + item.unit!)
                           .fontSize($r('app.float.fontSize_16'))
                           .fontWeight(FontWeight.Lighter)
                           .fontColor($r('app.color.FFFFFF'))
@@ -448,7 +448,7 @@ struct LittleMaterialsOutBound {
                             .fontWeight(FontWeight.Lighter)
                             .fontColor($r('app.color.FFFFFF'))
                             .maxLines(1)
-                          Text('数量:' + item.materials?.[0]?.num!)
+                          Text('数量:' + item.materials?.[0]?.num! + item.materials?.[0].unit!)
                             .fontSize($r('app.float.fontSize_16'))
                             .fontWeight(FontWeight.Lighter)
                             .fontColor($r('app.color.FFFFFF'))
@@ -465,7 +465,7 @@ struct LittleMaterialsOutBound {
                         .alignItems(HorizontalAlign.Start)
                       }
                       .width('32.8%')
-                      .height('25%')
+                      .height('23%')
                       .borderRadius($r('app.float.virtualSize_16'))
                       .backgroundColor(this.selectVehicleIndex === index ? $r('app.color.2030D158') : $r('app.color.20FFFFFF'))
                       .borderWidth(1)
@@ -480,7 +480,7 @@ struct LittleMaterialsOutBound {
                 .scrollable(ScrollDirection.Vertical) // 垂直滚动
                 .scrollBar(BarState.Auto)
                 .width('96.6%')
-                .height('82.7%')
+                .height('87%')
               }
               .width('100%')
               .height('87.4%')
@@ -587,7 +587,7 @@ struct LittleMaterialsOutBound {
                             .fontWeight(FontWeight.Lighter)
                             .fontColor($r('app.color.FFFFFF'))
                             .maxLines(1)
-                          Text('数量:' + item.num!)
+                          Text('数量:' + item.num! + item.unit!)
                             .fontSize($r('app.float.fontSize_16'))
                             .fontWeight(FontWeight.Lighter)
                             .fontColor($r('app.color.FFFFFF'))

+ 1 - 1
entry/src/main/ets/view/wms/OperationMaterialKitOneStep.ets

@@ -320,7 +320,7 @@ export struct OperationMaterialKitOneStep {
                         .fontColor($r('app.color.FFFFFF'))
                         .maxLines(1)
 
-                      Text((material.kitNum? material.kitNum : 0) + '/' + (material.storageNum? material.storageNum : 0))
+                      Text((material.kitNum? material.kitNum : 0) + '/' + (material.storageNum ? material.storageNum : 0) + (material.unit ? material.unit : ''))
                         .fontSize($r('app.float.fontSize_16'))
                         .fontWeight(FontWeight.Bold)
                         .fontColor($r('app.color.FFFFFF'))

+ 5 - 5
entry/src/main/ets/view/wms/OperationMaterialKitTwoStep.ets

@@ -267,7 +267,7 @@ export struct OperationMaterialKitTwoStep {
                     .fontColor($r('app.color.FFFFFF'))
                     .maxLines(1)
 
-                  Text('已齐套/需求:' + item.kitNum! + '/' + item.num!)
+                  Text('已齐套/需求:' + item.kitNum! + '/' + item.num! + item.unit!)
                     .fontSize($r('app.float.fontSize_16'))
                     .fontWeight(FontWeight.Lighter)
                     .fontColor($r('app.color.FFFFFF'))
@@ -306,7 +306,7 @@ export struct OperationMaterialKitTwoStep {
           })
         }
         .width('100%')
-        .height('90%')
+        .height('83%')
         .alignListItem(ListItemAlign.Center)
       }
       .height('100%')
@@ -432,7 +432,7 @@ export struct OperationMaterialKitTwoStep {
                     .fontColor($r('app.color.FFFFFF'))
                     .maxLines(1)
 
-                  Text(item.num ? item.num.toString() : '0')
+                  Text((item.num ? item.num.toString() : '0') + item.unit!)
                     .fontSize($r('app.float.fontSize_16'))
                     .fontWeight(FontWeight.Bold)
                     .fontColor($r('app.color.FFFFFF'))
@@ -593,7 +593,7 @@ struct SelectMaterialBoxDialog {
                   .fontWeight(FontWeight.Lighter)
                   .fontColor($r('app.color.FFFFFF'))
                   .maxLines(1)
-                Text('数量:' + item.materials?.[0]?.num!)
+                Text('数量:' + item.materials?.[0]?.num! + item.unit!)
                   .fontSize($r('app.float.fontSize_16'))
                   .fontWeight(FontWeight.Lighter)
                   .fontColor($r('app.color.FFFFFF'))
@@ -741,7 +741,7 @@ struct ThisScanDialog {
                     .fontWeight(FontWeight.Lighter)
                     .fontColor($r('app.color.FFFFFF'))
                     .maxLines(1)
-                  Text('数量:' + item.num!)
+                  Text('数量:' + item.num! + item.unit!)
                     .fontSize($r('app.float.fontSize_16'))
                     .fontWeight(FontWeight.Lighter)
                     .fontColor($r('app.color.FFFFFF'))