From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 998769d..2c60ab6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -125,7 +125,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo(),elem.getSource(),elem.getVendor()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
@@ -264,6 +264,7 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ MatCode matCode = matCodeService.selectById(detlDto.getLocDetl().getMatNo());
// 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
WrkDetl wrkDetl = new WrkDetl();
@@ -277,6 +278,12 @@
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
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.setVendor(detlDto.getLocDetl().getVendor());
+ wrkDetl.setSource(detlDto.getLocDetl().getSource());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -678,6 +685,12 @@
locDetl.setAppeUser(userId);
locDetl.setAppeTime(new Date());
locDetl.setZpallet(param.getZpallet());//鎵樼洏鍙�
+ locDetl.setVendor(adjust.getVendor());
+ locDetl.setSource(adjust.getSource());
+ locDetl.setSupplier(adjust.getSupplier());
+ locDetl.setQtyBox(matCode.getStr6());
+ locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
+ locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
@@ -698,11 +711,18 @@
throw new CoolException("娓呴櫎搴撳瓨鏄庣粏澶辫触");
}
} else {
+ MatCode matCode = matCodeService.selectById(adjust.getMatNo());
LocDetl sqlParam1 = new LocDetl();
sqlParam1.setQty(adjust.getCount());
sqlParam1.setSupplier(adjust.getSupplier());
sqlParam1.setModiTime(new Date());
sqlParam1.setModiUser(userId);
+ sqlParam1.setVendor(adjust.getVendor());
+ sqlParam1.setSource(adjust.getSource());
+ sqlParam1.setSupplier(adjust.getSupplier());
+ sqlParam1.setQtyBox(matCode.getStr6());
+ sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
+ sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
.eq("mat_no", adjust.getMatNo())
--
Gitblit v1.9.1