From c866b8a4cccdfe330ae2da833c62577d6a902a03 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 19 四月 2022 10:14:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    4 ++--
 1 files changed, 2 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 b6b8d33..0a68b5b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -280,8 +280,8 @@
                 wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                 wrkDetl.setQtyBox(matCode.getStr6());
                 wrkDetl.setWeight(matCode.getWeight());
-                wrkDetl.setAllWeight(qty*matCode.getWeight()+30);
-                wrkDetl.setAllQty(qty*matCode.getStr6());
+                wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
+                wrkDetl.setAllQty(matCode.getStr6()!=null ? qty*matCode.getStr6() : 0);
                 wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
                 wrkDetl.setSource(detlDto.getLocDetl().getSource());
                 wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());

--
Gitblit v1.9.1