From 106669c0b850f1467fed8eda92a12343bb9d88d1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 25 十一月 2022 10:32:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 54c52e1..c942b02 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -96,6 +96,13 @@
         if (countLoc > 0 || countWrk > 0) {
             throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
         }
+        //璁剧疆闈瀗ull鎵瑰彿锛�
+        for (CombParam.CombMat combMat : param.getCombMats()) {
+            if (combMat.getBatch() == null){
+                combMat.setBatch("");
+            }
+        }
+
 
         Date now = new Date();
 
@@ -212,14 +219,14 @@
                 throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
             }
             if (Cools.isEmpty(combMat.getBatch())){
-                throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+//                throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
             }
             ManLocDetl manLocDetl = new ManLocDetl();
             manLocDetl.setLocNo(locno);
             manLocDetl.setNodeId(node.getId());
             manLocDetl.setMaktx(mat.getMaktx());
             manLocDetl.setMatnr(mat.getMatnr());
-            manLocDetl.setBatch(combMat.getBatch());
+            manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
             manLocDetl.setAnfme(combMat.getAnfme());
             manLocDetl.setModiTime(now);
             if (!manLocDetlService.insert(manLocDetl)) {

--
Gitblit v1.9.1