优化

Scripts/gandart/gandartComposite.js

@@ -389,14 +389,23 @@ async function doExecFinalComposite(taskId, taskInfo, finalGroups) {
         }
     }
     if (retOrderLst.length > 0) {
-        lk.log(`合成成功单数：${retOrderLst.length}`);
+        let successCnt = 0;
+        let noStockCnt = 0;
         for (let i = 0; i < retOrderLst.length; i++) {
             const orderNum = retOrderLst[i];
             lk.log(`[${i}]单号：${orderNum}`);
-            if (orderNum && orderNum.indexOf('#') == -1) {
+            if (orderNum.indexOf('#') > -1) {
+                successCnt += 1;
+            } else if (orderNum.indexOf('!') > -1) {
+                noStockCnt += 1;
+            } else {
+                successCnt += 1;
                 await checkCompositeResult(orderNum);
             }
         }
+        lk.log(`合成成功单数：${successCnt}`);
+        lk.log(`库存不足单数：${noStockCnt}`);
+
         // 从高的序号删除
         for (let i = retWillDelLst.length - 1; i >= 0; i--) {
             let idx = retWillDelLst[i];
@@ -805,12 +814,16 @@ async function confirmCompositeV2(taskId, taskInfo, materialDetailList) {
                             lk.log(dismsg);
                             lk.appendNotifyInfo(`🎉${dismsg}`);
                         } else {
+                            lk.log(`合成失败，响应：${data}`);
                             let respMsg = ret.msg;
-                            if (respMsg && (respMsg.indexOf('合成中') > -1 || respMsg.indexOf('已合成') > -1)) {
-                                lk.appendNotifyInfo(`🎉${respMsg}`);
-                                retOrder = '#HC123456789';
-                            } else {
-                                lk.log(`合成失败，响应：${data}`);
+                            if (respMsg) {
+                                if (respMsg.indexOf('合成中') > -1 || respMsg.indexOf('已合成') > -1) {
+                                    lk.appendNotifyInfo(`🎉${respMsg}`);
+                                    retOrder = '#HC123456789';
+                                } else if (respMsg.indexOf('不足') > -1) {
+                                    lk.appendNotifyInfo(`⚠️${respMsg}`);
+                                    retOrder = '!HC123456789';
+                                }
                             }
                         }
                     }