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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 2d72e51..405a18c 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.getCount()));
+ 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,10 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
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();
@@ -276,6 +280,17 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
+ wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
+ 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());
+ 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("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -490,6 +505,7 @@
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
sqlParam.setMatNo(paramLocDetl.getMatNo());
+ sqlParam.setSupplier(paramLocDetl.getSupplier());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));
}
@@ -651,6 +667,7 @@
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(locMast.getLocNo());
sqlParam.setMatNo(adjust.getMatNo());
+ sqlParam.setSupplier(adjust.getSupplier());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
// 淇濆瓨鏂板簱瀛樻槑缁�
if (Cools.isEmpty(one)) {
@@ -662,11 +679,29 @@
locDetl.setLocNo(locMast.getLocNo());
locDetl.setQty(adjust.getCount()); // 鏁伴噺
VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
+
+ if (Cools.isEmpty(adjust.getSupplier())){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ locDetl.setSupplier(sdf.format(new Date()));
+ }else {
+ locDetl.setSupplier(adjust.getSupplier());
+ }
+
+
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
locDetl.setModiTime(new Date());
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);
+ locDetl.setStr3(matCode.getStr3());
+ locDetl.setStr4(matCode.getStr4());
+ locDetl.setStr5(matCode.getStr5());
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
@@ -687,13 +722,25 @@
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);
+ 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()))) {
+ .eq("mat_no", adjust.getMatNo())
+ .eq("supplier",adjust.getSupplier()))) {
throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
}
}
--
Gitblit v1.9.1