From 7e5af854912e55b679c35f48631af1c104e4521e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 十一月 2024 14:53:00 +0800
Subject: [PATCH] #并板入库

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 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 db4b0a1..78041df 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -386,7 +386,9 @@
 
         int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
         WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
-
+        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104){
+            throw new CoolException(param.getBarcode() + "璇ユ潯鐮佹暟鎹笉涓哄苟鏉垮嚭搴�");
+        }
 
         //璁剧疆闈瀗ull鎵瑰彿锛�
         for (CombParam.CombMat combMat : param.getCombMats()) {
@@ -395,22 +397,21 @@
             }
         }
 
-
-
-
         Date now = new Date();
         for (CombParam.CombMat combMat : param.getCombMats()) {
             Mat mat = matService.selectByMatnr(combMat.getMatnr());
-            LocDetl locDetl = new LocDetl();
-            locDetl.sync(mat);
-            locDetl.setLocNo(wrkMast.getSourceLocNo());
-            locDetl.setZpallet(param.getBarcode());
-            locDetl.setAnfme(combMat.getAnfme());
-            locDetl.setAppeTime(now);
-            locDetl.setAppeUser(userId);
-            locDetl.setModiTime(now);
-            locDetl.setModiUser(userId);
-            locDetlService.insert(locDetl);
+            WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(mat);
+            wrkDetl.setBatch(combMat.getBatch());
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setOrderNo(param.getOrderNo());
+            wrkDetl.setZpallet(param.getBarcode());
+            wrkDetl.setAnfme(combMat.getAnfme());
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setAppeUser(userId);
+            wrkDetl.setModiTime(now);
+            wrkDetl.setModiUser(userId);
+            wrkDetlService.insert(wrkDetl);
         }
 
 

--
Gitblit v1.9.1