From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 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 73bb1ea..a551d93 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -72,7 +72,7 @@
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -136,10 +136,10 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo(), paramLocDetl.getCount())) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatnr(paramLocDetl.getMatnr());
+ sqlParam.setMatNo(paramLocDetl.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
}
@@ -220,8 +220,8 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
- wrkDetl.setAnfme(anfme); // 鏁伴噺
+ Double qty = ioType==101?detlDto.getLocDetl().getQty():detlDto.getCount();
+ wrkDetl.setQty(qty); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
@@ -254,7 +254,7 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -372,12 +372,12 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo())) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatnr(paramLocDetl.getMatnr());
+ sqlParam.setMatNo(paramLocDetl.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));
}
}
if (!locDetlDtos.isEmpty()) {
@@ -434,7 +434,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(locDetl.getAnfme());
+ wrkDetl.setQty(locDetl.getQty());
VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
@@ -505,22 +505,22 @@
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
- if (Cools.isEmpty(adjust.getMatnr())) {
+ if (Cools.isEmpty(adjust.getMatNo())) {
throw new CoolException(BaseRes.PARAM);
}
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(locMast.getLocNo());
- sqlParam.setMatnr(adjust.getMatnr());
+ sqlParam.setMatNo(adjust.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
// 淇濆瓨鏂板簱瀛樻槑缁�
if (Cools.isEmpty(one)) {
if (adjust.getCount() == 0){
continue;
}
- MatCode matCode = matCodeService.selectById(adjust.getMatnr());
+ MatCode matCode = matCodeService.selectById(adjust.getMatNo());
LocDetl locDetl = new LocDetl();
locDetl.setLocNo(locMast.getLocNo());
- locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
+ locDetl.setQty(adjust.getCount()); // 鏁伴噺
VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
locDetl.setModiTime(new Date());
@@ -532,14 +532,14 @@
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
adjDetl.setLocNo(locDetl.getLocNo());
- adjDetl.setMatNo(locDetl.getMatnr());
+ adjDetl.setMatNo(locDetl.getMatNo());
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetlService.save(adjDetl, userId);
// 淇敼鍘熷簱瀛樻槑缁�
} else {
// 濡傛灉鏁伴噺淇敼锛屽垯鏇存柊搴撳瓨鏄庣粏
- if (!adjust.getCount().equals(one.getAnfme())) {
+ if (!adjust.getCount().equals(one.getQty())) {
// 褰撴暟閲忚淇敼涓� 0 鏃讹紝鐩存帴娓呴櫎搴撳瓨鏄庣粏
if (adjust.getCount() == 0) {
if (!locDetlService.delete(new EntityWrapper<>(one))) {
@@ -547,20 +547,20 @@
}
} else {
LocDetl sqlParam1 = new LocDetl();
- sqlParam1.setAnfme(adjust.getCount());
+ sqlParam1.setQty(adjust.getCount());
sqlParam1.setModiTime(new Date());
sqlParam1.setModiUser(userId);
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
- .eq("matnr", adjust.getMatnr()))) {
+ .eq("mat_no", adjust.getMatNo()))) {
throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
}
}
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
adjDetl.setLocNo(locMast.getLocNo());
- adjDetl.setMatNo(adjust.getMatnr());
- adjDetl.setOriQty(one.getAnfme());
+ adjDetl.setMatNo(adjust.getMatNo());
+ adjDetl.setOriQty(one.getQty());
adjDetl.setAdjQty(adjust.getCount());
adjDetlService.save(adjDetl, userId);
}
@@ -644,12 +644,15 @@
}
// 鍒犻櫎宸ヤ綔涓绘。
boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+
+ if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
+ boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
}
- // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
- boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
// 淇敼搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
@@ -659,7 +662,7 @@
locMast.setModiTime(new Date());
locMast.setModiUser(userId);
boolean locMastRes = locMastService.updateById(locMast);
- if (!wrkMastRes || !wrkDetlRes || !locMastRes) {
+ if (!wrkMastRes || !locMastRes) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
--
Gitblit v1.9.1