From b8975f62b72528006a840e63810f1644560ac4fd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 09:58:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index ece8889..c0045f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -316,6 +316,7 @@
     @Override
     @Transactional
     public void packageUp(String barcode) {
+        Mat analyse = MatUtils.analyseMat(barcode);
         Pack pack = packService.selectByBarcode(barcode);
         if (null != pack) {
             throw new CoolException(barcode + "閲嶅鎻愪氦");
@@ -323,8 +324,8 @@
         Date now = new Date();
         pack = new Pack(
                 barcode,    // 鏉$爜[闈炵┖]
-                null,    // 鍟嗗搧缂栧彿
-                null,    // 鎵瑰彿
+                analyse.getMatnr(),    // 鍟嗗搧缂栧彿
+                analyse.getBarcode(),    // 鎵瑰彿
                 1L,    // 璁㈠崟鐘舵��
                 1,    // 鐘舵��
                 now,    // 娣诲姞鏃堕棿
@@ -337,7 +338,6 @@
             throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
         }
 
-        Mat analyse = MatUtils.analyseMat(barcode);
         Mat mat = matService.selectByMatnr(analyse.getMatnr());
         if (mat == null) {
             mat = new Mat();
@@ -351,6 +351,8 @@
             mat.setMemo("鎵撳寘涓婄嚎");
             if (!matService.insert(mat)) {
                 throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+            } else {
+                log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
             }
         }
     }

--
Gitblit v1.9.1