From b43d307ac60607bcc556ca52c54cee0176b66273 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期五, 06 五月 2022 14:54:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 0a68b5b..405a18c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -265,6 +265,9 @@
             // 鐢熸垚宸ヤ綔妗f槑缁�
             for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                 MatCode matCode = matCodeService.selectById(detlDto.getLocDetl().getMatNo());
+                if(Cools.isEmpty(matCode)){
+                    throw new CoolException("浜у搧缂栫爜鍦ㄥ熀纭�鏁版嵁涓笉瀛樺湪锛岃纭");
+                }
                 // 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
                 if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                 WrkDetl wrkDetl = new WrkDetl();
@@ -278,8 +281,8 @@
                 wrkDetl.setModiTime(new Date());
                 wrkDetl.setModiUser(userId);
                 wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
-                wrkDetl.setQtyBox(matCode.getStr6());
-                wrkDetl.setWeight(matCode.getWeight());
+                wrkDetl.setQtyBox(matCode.getStr6()!=null ? matCode.getStr6() : 0);
+                wrkDetl.setWeight(matCode.getWeight()!=null ? matCode.getWeight() : 0);
                 wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
                 wrkDetl.setAllQty(matCode.getStr6()!=null ? qty*matCode.getStr6() : 0);
                 wrkDetl.setVendor(detlDto.getLocDetl().getVendor());

--
Gitblit v1.9.1