From 27a6c44642cd3328f9b2afa4f52a4c4b65624d0f Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 14 五月 2021 14:00:12 +0800
Subject: [PATCH] 平仓入库当入库通知档不存在时的校验判断

---
 src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java |   64 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 3de54ca..a992ebc 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -150,37 +150,39 @@
     /* cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺 */
     private boolean custWaitPakinToLog(LocNormal list, Double updateAnfme) {
         WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("supplier", list.getSupplier()).and().eq("matnr", list.getMatnr()));
-        WaitPakinLog waitPakinLog = new WaitPakinLog();
-        waitPakinLog.setAnfme(updateAnfme);
-        waitPakinLog.setMatnr(waitPakin.getMatnr());
-        waitPakinLog.setMaktx(waitPakin.getMaktx());
-        waitPakinLog.setLgnum(waitPakin.getLgnum());
-        waitPakinLog.setType(waitPakin.getType());
-        waitPakinLog.setMnemonic(waitPakin.getMnemonic());
-        waitPakinLog.setSupplier(waitPakin.getSupplier());
-        waitPakinLog.setWarehouse(waitPakin.getWarehouse());
-        waitPakinLog.setBrand(waitPakin.getBrand());
-        waitPakinLog.setAltme(waitPakin.getAltme());
-        waitPakinLog.setZpallet(waitPakin.getZpallet());
-        waitPakinLog.setBname(waitPakin.getBname());
-        waitPakinLog.setLocNo(waitPakin.getLocNo());
-        waitPakinLog.setStatus(waitPakin.getStatus());
-        waitPakinLog.setIoStatus(waitPakin.getIoStatus());
-        waitPakinLog.setMemo(waitPakin.getMemo());
-        waitPakinLog.setModiTime(waitPakin.getModiTime());
-        waitPakinLog.setModiUser(waitPakin.getModiUser());
-        waitPakinLog.setAppeTime(waitPakin.getAppeTime());
-        waitPakinLog.setAppeUser(waitPakin.getAppeUser());
-        // 杞叆搴撻�氱煡鍘嗗彶妗�
-        waitPakinLogService.insert(waitPakinLog);
-        // 淇敼鍏ュ簱鍚屽織妗g墿鏂欐暟閲�
-        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
-        wrapper.eq("supplier", list.getSupplier())
-                .eq("matnr", list.getMatnr())
-                .isNull("zpallet");
-        WaitPakin pakin = new WaitPakin();
-        pakin.setAnfme(waitPakin.getAnfme() - updateAnfme);
-        waitPakinService.update(pakin, wrapper);
+        if(!Cools.isEmpty(waitPakin)){
+            WaitPakinLog waitPakinLog = new WaitPakinLog();
+            waitPakinLog.setAnfme(updateAnfme);
+            waitPakinLog.setMatnr(waitPakin.getMatnr());
+            waitPakinLog.setMaktx(waitPakin.getMaktx());
+            waitPakinLog.setLgnum(waitPakin.getLgnum());
+            waitPakinLog.setType(waitPakin.getType());
+            waitPakinLog.setMnemonic(waitPakin.getMnemonic());
+            waitPakinLog.setSupplier(waitPakin.getSupplier());
+            waitPakinLog.setWarehouse(waitPakin.getWarehouse());
+            waitPakinLog.setBrand(waitPakin.getBrand());
+            waitPakinLog.setAltme(waitPakin.getAltme());
+            waitPakinLog.setZpallet(waitPakin.getZpallet());
+            waitPakinLog.setBname(waitPakin.getBname());
+            waitPakinLog.setLocNo(waitPakin.getLocNo());
+            waitPakinLog.setStatus(waitPakin.getStatus());
+            waitPakinLog.setIoStatus(waitPakin.getIoStatus());
+            waitPakinLog.setMemo(waitPakin.getMemo());
+            waitPakinLog.setModiTime(waitPakin.getModiTime());
+            waitPakinLog.setModiUser(waitPakin.getModiUser());
+            waitPakinLog.setAppeTime(waitPakin.getAppeTime());
+            waitPakinLog.setAppeUser(waitPakin.getAppeUser());
+            // 杞叆搴撻�氱煡鍘嗗彶妗�
+            waitPakinLogService.insert(waitPakinLog);
+            // 淇敼鍏ュ簱鍚屽織妗g墿鏂欐暟閲�
+            Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
+            wrapper.eq("supplier", list.getSupplier())
+                    .eq("matnr", list.getMatnr())
+                    .isNull("zpallet");
+            WaitPakin pakin = new WaitPakin();
+            pakin.setAnfme(waitPakin.getAnfme() - updateAnfme);
+            waitPakinService.update(pakin, wrapper);
+        }
         return true;
     }
 

--
Gitblit v1.9.1