From 8aef28e39575b910aa08c0c102c868d60fb306ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 16:10:42 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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 4f6fb7f..03d7555 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -141,7 +141,7 @@
}
if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, 101, userId);
+ stockOut(staNo, locDetlDtos, null, userId);
} else {
throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
}
@@ -169,7 +169,9 @@
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- ioType = (dto.isAll() && (ioType==101||ioType==103))?101:103;
+ if (ioType == null) {
+ ioType = dto.isAll() ? 101 : 103;
+ }
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
// 鑾峰彇璺緞
@@ -668,13 +670,13 @@
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佷笉鑳芥嫞鏂欏叆搴�");
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
- }
+// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+// }
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- throw new CoolException("鍒犻櫎宸ヤ綔鏄庣粏妗ｆ。鍘嗗彶妗ｅけ璐�");
- }
+// if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+// throw new CoolException("鍒犻櫎宸ヤ綔鏄庣粏妗ｆ。鍘嗗彶妗ｅけ璐�");
+// }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
@@ -702,23 +704,23 @@
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
- // 鏇存柊/鍒犻櫎鎷ｆ枡搴撳瓨鏄庣粏
- for (WrkDetl wrkDetl : wrkDetls) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()));
- // 搴撳瓨鏁伴噺璁＄畻
- locDetl.setAnfme(locDetl.getAnfme() - wrkDetl.getAnfme());
- if (locDetl.getAnfme() > 0) {
- locDetl.setModiTime(new Date());
- locDetl.setModiUser(userId);
- if (!locDetlService.updateById(locDetl)) {
- throw new CoolException("鏇存柊搴撳瓨鏄庣粏澶辫触");
- }
- } else {
- if (!locDetlService.delete(new EntityWrapper<>(locDetl))) {
- throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
- }
- }
- }
+// // 鏇存柊/鍒犻櫎鎷ｆ枡搴撳瓨鏄庣粏
+// for (WrkDetl wrkDetl : wrkDetls) {
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()));
+// // 搴撳瓨鏁伴噺璁＄畻
+// locDetl.setAnfme(locDetl.getAnfme() - wrkDetl.getAnfme());
+// if (locDetl.getAnfme() > 0) {
+// locDetl.setModiTime(new Date());
+// locDetl.setModiUser(userId);
+// if (!locDetlService.updateById(locDetl)) {
+// throw new CoolException("鏇存柊搴撳瓨鏄庣粏澶辫触");
+// }
+// } else {
+// if (!locDetlService.delete(new EntityWrapper<>(locDetl))) {
+// throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+// }
+// }
+// }
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
locMast.setLocType("Q");
--
Gitblit v1.9.1