From 730b8f59c9d54ab30d343fce6f96fd1e96eefdd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 13 七月 2020 11:08:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 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 03d7555..c3e32e1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -659,23 +659,17 @@
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- String locNo = wrkMast.getSourceLocNo();
- // 鎷ｆ枡浣滀笟鍒ゆ柇
- if (wrkMast.getIoType() != 103) {
- throw new CoolException("鍏ュ嚭搴撶被鍨嬩笉鏄�103.鎷ｆ枡鍑哄簱");
+ // 鍏ュ嚭搴撶被鍨嬪垽鏂�
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
}
// 宸ヤ綔鐘舵�佸垽鏂�
if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佷笉鑳芥嫞鏂欏叆搴�");
+ 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 (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -683,7 +677,7 @@
}
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", 53) // type_no: 53.鎷ｆ枡鍐嶅叆搴�
+ .eq("type_no", wrkMast.getIoType() - 50)
.eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -693,7 +687,7 @@
// 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
Integer staNo = staDesc.getCrnStn();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(53); // 鍏ュ嚭搴撶被鍨�: 53.鎷ｆ枡鍐嶅叆搴�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
@@ -704,23 +698,6 @@
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("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
-// }
-// }
-// }
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
locMast.setLocType("Q");
--
Gitblit v1.9.1