From 4f1abba02bec2a86e4a34d6ffbd65f7a92c3f659 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:15:22 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/OpenController.java |   73 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
index 0f77e5a..2aebcd8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -63,44 +63,11 @@
         for (ReplenishDto param : params.getList()) {
             Mat mat = matService.selectByMatnr(param.getMatnr());
             List<Prior> priors = priorService.selectList(new EntityWrapper<Prior>().eq("matnr", param.getMatnr()));
+            Node node;
             // 鏈夋帹鑽愯揣浣�
             if (!Cools.isEmpty(priors)) {
                 Prior prior = priors.get(0);
-                Node node = nodeService.selectById(prior.getNodeId());
-
-                // 淇濆瓨鍏ュ簱璁板綍
-                Pakin pakin = new Pakin(
-                        "BC" + String.valueOf(snowflakeIdWorker.nextId()),    // 浠诲姟鍙穂闈炵┖]
-                        null,    // 宸ヤ綔鐘舵��
-                        null,    // 鎵樼洏鍙�
-                        param.getCount(),    // 鍏ュ簱鏁伴噺
-                        node.getId(),    // 鍏宠仈璐т綅[闈炵┖]
-                        node.getUuid(),    // 璐т綅[闈炵┖]
-                        mat.getMatnr(),    // 鍟嗗搧缂栫爜[闈炵┖]
-                        null,    // 鍟嗗搧鍚嶇О
-                        null,    // 鍚嶇О
-                        null,    // 灏虹爜
-                        null,    // 鍨嬪彿
-                        null,    // 鎵瑰彿
-                        null,    // 鍗曚綅
-                        null,    // SKC
-                        null,    // 鍗曟嵁绫诲瀷
-                        null,    // 鍗曟嵁缂栧彿
-                        null,    // 瀹㈡埛鍚嶇О
-                        null,    // 鍝侀」鏁�
-                        null,    // 鏁伴噺
-                        null,    // 閲嶉噺
-                        1,    // 鐘舵��
-                        9527L,    // 娣诲姞浜哄憳
-                        now,    // 娣诲姞鏃堕棿
-                        9527L,    // 淇敼浜哄憳
-                        now,    // 淇敼鏃堕棿
-                        null    // 澶囨敞
-                );
-                VersionUtils.setPakin(pakin, mat);
-                if (!pakinService.insert(pakin)) {
-                    throw new CoolException("淇濆瓨鍏ュ簱璁板綍澶辫触");
-                }
+                node = nodeService.selectById(prior.getNodeId());
 
                 LocDetl locDetl = locDetlService.getLocDetl(node.getId(), param.getMatnr());
                 if (locDetl == null) {
@@ -126,7 +93,7 @@
 
             // 娌℃湁鎺ㄨ崘璐х墿
             } else {
-                Node node = nodeService.selectByUuid(Parameter.get().getUniNode());
+                node = nodeService.selectByUuid(Parameter.get().getUniNode());
 
                 LocDetl locDetl = locDetlService.getLocDetl(node.getId(), param.getMatnr());
                 if (locDetl == null) {
@@ -150,6 +117,40 @@
                     }
                 }
             }
+
+            // 淇濆瓨鍏ュ簱璁板綍
+            Pakin pakin = new Pakin(
+                    "BC" + String.valueOf(snowflakeIdWorker.nextId()),    // 浠诲姟鍙穂闈炵┖]
+                    null,    // 宸ヤ綔鐘舵��
+                    null,    // 鎵樼洏鍙�
+                    param.getCount(),    // 鍏ュ簱鏁伴噺
+                    node.getId(),    // 鍏宠仈璐т綅[闈炵┖]
+                    node.getUuid(),    // 璐т綅[闈炵┖]
+                    mat.getMatnr(),    // 鍟嗗搧缂栫爜[闈炵┖]
+                    null,    // 鍟嗗搧鍚嶇О
+                    null,    // 鍚嶇О
+                    null,    // 灏虹爜
+                    null,    // 鍨嬪彿
+                    null,    // 鎵瑰彿
+                    null,    // 鍗曚綅
+                    null,    // SKC
+                    null,    // 鍗曟嵁绫诲瀷
+                    null,    // 鍗曟嵁缂栧彿
+                    null,    // 瀹㈡埛鍚嶇О
+                    null,    // 鍝侀」鏁�
+                    null,    // 鏁伴噺
+                    null,    // 閲嶉噺
+                    1,    // 鐘舵��
+                    9527L,    // 娣诲姞浜哄憳
+                    now,    // 娣诲姞鏃堕棿
+                    9527L,    // 淇敼浜哄憳
+                    now,    // 淇敼鏃堕棿
+                    "琛ヤ粨鍏ュ簱"    // 澶囨敞
+            );
+            VersionUtils.setPakin(pakin, mat);
+            if (!pakinService.insert(pakin)) {
+                throw new CoolException("淇濆瓨鍏ュ簱璁板綍澶辫触");
+            }
         }
         return R.ok();
     }

--
Gitblit v1.9.1