From bc196046ae1ca301fadab2d0655458a5441034ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 12:47:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 4 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 66 ++++++++++++++++++++++++++-------
src/main/java/com/zy/asrs/controller/WorkController.java | 4 +-
3 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ea8ef6..9cd8f19 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -69,9 +69,9 @@
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
if (type == 1) {
- workService.completeWrkMast(workNo);
+ workService.completeWrkMast(workNo, getUserId());
} else if (type == 2) {
- workService.cancelWrkMast(workNo);
+ workService.cancelWrkMast(workNo, getUserId());
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 855f16b..b6a82e0 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -24,10 +24,10 @@
/**
* 鎵嬪姩瀹屾垚宸ヤ綔妗�
*/
- void completeWrkMast(String workNo);
+ void completeWrkMast(String workNo, Long userId);
/**
* 鎵嬪姩鍙栨秷宸ヤ綔妗�
*/
- void cancelWrkMast(String workNo);
+ void cancelWrkMast(String workNo, Long userId);
}
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 9cb39a0..904812f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -222,7 +222,7 @@
@Override
@Transactional
- public void completeWrkMast(String workNo) {
+ public void completeWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
@@ -234,6 +234,8 @@
} else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
}
+ wrkMast.setModiTime(new Date());
+ wrkMast.setModiUser(userId);
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
}
@@ -241,30 +243,66 @@
@Override
@Transactional
- public void cancelWrkMast(String workNo) {
+ public void cancelWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
- // 鍏ュ簱
+ String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
+ String locType = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
+ // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
if (wrkMast.getWrkSts() < 4) {
- if (wrkMast.getIoType() != 11) {
-
- } else {
- // 搴撲綅杞Щ
-
-
+ locNo = wrkMast.getLocNo();
+ locType = "O";
+ /**
+ * 搴撲綅杞Щ
+ * 鍙栨秷鍚� 婧愬簱浣� ==>> F.鍦ㄥ簱
+ * 鐩爣搴撲綅 ===>> O.绌哄簱浣�
+ **/
+ if (wrkMast.getIoType() == 11) {
+ // 搴撲綅杞Щ锛氭簮搴撲綅
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(wrkMast.getSourceLocNo());
+ locMast.setLocType("F");
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(userId);
+ locMastService.updateById(locMast);
}
- // 鍑哄簱
+ // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
} else if (wrkMast.getWrkSts() > 10) {
-
+ locNo = wrkMast.getSourceLocNo();
+ // 鍑哄簱 ===>> F.鍦ㄥ簱
+ if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
+ locType = "F";
+ // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
+ } else if (wrkMast.getIoType() == 110) {
+ locType = "D";
+ // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
+ } else if (wrkMast.getIoType() == 11) {
+ locType = "F";
+ // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(wrkMast.getLocNo());
+ locMast.setLocType("O");
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(userId);
+ locMastService.updateById(locMast);
+ }
}
// 鍒犻櫎宸ヤ綔妗�
- wrkMastService.deleteById(wrkMast);
+ boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
// 鍒犻櫎宸ヤ綔妗ｆ槑缁�
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
+ boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
// 淇敼搴撲綅鐘舵��
-// locMastService.updateById()
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocType(locType);
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(userId);
+ boolean locMastRes = locMastService.updateById(locMast);
+ if (!wrkMastRes || !wrkDetlRes || !locMastRes) {
+ throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ }
}
}
--
Gitblit v1.9.1