From 039a5164c62d10d9c83bddaebaa43cd1ff11c417 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 07 八月 2024 20:43:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    5 +++--
 src/main/java/com/zy/common/web/WcsController.java          |    5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 629f323..b633d6b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -354,8 +354,9 @@
                     List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                     if (wrkDetls101.isEmpty()) {
 //                        exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
-                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗d负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+//                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                        return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗d负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+                        log.error("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
                     }
                     for (WrkDetl wrkDetl : wrkDetls101) {
                         // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ef8770e..7c0e292 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -141,6 +141,9 @@
         if (Cools.isEmpty(basDevp)){
             throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
         }
+        if (Cools.isEmpty(basDevp.getGrossWt())){
+            throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 "+param.getSourceStaNo()+"閲嶉噺淇℃伅涓嶅瓨鍦�");
+        }
 
         Date now = new Date();
         // 鐢熸垚鍏ュ簱閫氱煡妗�
@@ -152,7 +155,7 @@
         waitPakin.sync(mat);
         waitPakin.setBatch("");
 //        waitPakin.setWeight(basDevp.getGrossWt());
-        waitPakin.setWeight(12.5);
+        waitPakin.setWeight(basDevp.getGrossWt());
         waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
         waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
         waitPakin.setAnfme(1.0);  // 鏁伴噺

--
Gitblit v1.9.1