From d559780d63e92b9cbbdf82b819cbc8bc9053da80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:18:59 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 87d453a..8faa579 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -64,22 +64,31 @@
             if (!update) {
                 throw new CoolException("淇敼鎵樼洏璧勬枡妗eけ璐�");
             }
-            // 鏇存柊璐т綅搴撳瓨鏄庣粏
-            LocDetl locDetl = new LocDetl();
-            locDetl.setLocNo(node.getName());
-            locDetl.setNodeId(node.getId());
-            locDetl.setZpallet(param.getZpallet());
-            locDetl.setAnfme(comb.getAnfme());
-            VersionUtils.setLocDetl(locDetl, comb);
-            locDetl.setStatus(1);
-            locDetl.setCreateBy(userId);
-            locDetl.setCreateTime(now);
-            locDetl.setUpdateBy(userId);
-            locDetl.setUpdateTime(now);
-            boolean insert = locDetlService.insert(locDetl);
-            if (!insert) {
-                throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�");
+            LocDetl locDetl = locDetlService.getLocDetl(node.getId(), comb.getMatnr());
+            if (locDetl == null) {
+                // 鏇存柊璐т綅搴撳瓨鏄庣粏
+                locDetl = new LocDetl();
+                locDetl.setLocNo(node.getName());
+                locDetl.setNodeId(node.getId());
+                locDetl.setZpallet(param.getZpallet());
+                locDetl.setAnfme(comb.getAnfme());
+                VersionUtils.setLocDetl(locDetl, comb);
+                locDetl.setStatus(1);
+                locDetl.setCreateBy(userId);
+                locDetl.setCreateTime(now);
+                locDetl.setUpdateBy(userId);
+                locDetl.setUpdateTime(now);
+                boolean insert = locDetlService.insert(locDetl);
+                if (!insert) {
+                    throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�");
+                }
+            } else {
+                if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) {
+                    throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�");
+                }
+
             }
+
         }
         return R.ok();
     }
@@ -130,7 +139,7 @@
         dto.setCustOrders(custOrders);
         // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
         mainService.stockOutProcess(dto);
-        return R.ok();
+        return R.ok("鐢熸垚鎷h揣鍗曟垚鍔�");
     }
 
     @Override

--
Gitblit v1.9.1