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 | 13 +++++++++++--
1 files changed, 11 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 05cdbe8..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,11 +280,14 @@
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());
+ wrkDetl.setStr5(matCode.getStr5());
+ wrkDetl.setStr4(matCode.getStr4());
+ wrkDetl.setStr3(matCode.getStr3());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -693,6 +696,9 @@
locDetl.setQtyBox(matCode.getStr6());
locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
+ locDetl.setStr3(matCode.getStr3());
+ locDetl.setStr4(matCode.getStr4());
+ locDetl.setStr5(matCode.getStr5());
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
@@ -725,6 +731,9 @@
sqlParam1.setQtyBox(matCode.getStr6());
sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
+ sqlParam1.setStr5(matCode.getStr5());
+ sqlParam1.setStr4(matCode.getStr4());
+ sqlParam1.setStr3(matCode.getStr3());
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
.eq("mat_no", adjust.getMatNo())
--
Gitblit v1.9.1