cjb 1 týždeň pred
rodič
commit
22085289cc

+ 1 - 1
entry/src/main/ets/pages/Menu.ets

@@ -152,7 +152,7 @@ struct menu {
         return
       }
       this.loginWms();
-    }, 2000); // 每500毫秒检查一次
+    }, 2000);
     const checkInterval2 = setInterval(() => {
       if (this.isConnected) {
         clearInterval(checkInterval2); // 停止轮询

+ 17 - 5
entry/src/main/ets/view/wms/CallMaterialNotification.ets

@@ -16,11 +16,23 @@ struct MaterialNotificationItem{
     Row(){
       Column() {
         // 订单标题(带订单号)
-        Text(`${this.item.orderName}${this.item.orderCode}`)
-          .fontSize($r('app.float.fontSize_30'))
-          .fontColor(this.item.workOrderState=="完成"?$r('app.color.FFFFFF'):$r('app.color.30FFFFFF'))
-          .width('100%')
-          .textAlign(TextAlign.Start)
+        Row(){
+          Text(`${this.item.orderName}${this.item.orderCode}`)
+            .fontSize($r('app.float.fontSize_30'))
+            .fontColor(this.item.workOrderState=="完成"?$r('app.color.FFFFFF'):$r('app.color.30FFFFFF'))
+            .textAlign(TextAlign.Start)
+          Row(){
+            Text(this.index/2===0?"齐套":"零星")
+              .fontSize($r('app.float.fontSize_24'))
+              .fontColor(this.index/2===0?$r('app.color.C08E68'):$r('app.color.BF5AF2'))
+              .width('100%')
+              .textAlign(TextAlign.Center)
+          }.width('7%')
+          .margin({left:'2%'})
+          .backgroundColor(this.index/2===0?$r('app.color.20C08E68'):$r('app.color.20BF5AF2'))
+          .borderRadius($r('app.float.virtualSize_16'))
+        }.width('100%')
+        .justifyContent(FlexAlign.Start)
 
         // 订单详情
         Column({ space: 3 }) {

+ 16 - 0
entry/src/main/resources/base/element/color.json

@@ -9,6 +9,22 @@
       "value": "#FFFFFF"
     },
     {
+      "name": "C08E68",
+      "value": "#C08E68"
+    },
+    {
+      "name": "20C08E68",
+      "value": "#33C08E68"
+    },
+    {
+      "name": "BF5AF2",
+      "value": "#BF5AF2"
+    },
+    {
+      "name": "20BF5AF2",
+      "value": "#33BF5AF2"
+    },
+    {
       "name": "000000",
       "value": "#000000"
     },