From 4cef4cd611b226e2d62de9859049b180b1a23f58 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 11:18:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 10 +++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 47 +++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 6 ++
3 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 39ddbcb..5ea8ef6 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -68,7 +68,11 @@
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
-
+ if (type == 1) {
+ workService.completeWrkMast(workNo);
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo);
+ }
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 8472b50..855f16b 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -20,4 +20,14 @@
*/
void emptyPlateOut(EmptyPlateOutParam param, Long userId);
+
+ /**
+ * 鎵嬪姩瀹屾垚宸ヤ綔妗�
+ */
+ void completeWrkMast(String workNo);
+
+ /**
+ * 鎵嬪姩鍙栨秷宸ヤ綔妗�
+ */
+ void cancelWrkMast(String workNo);
}
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 ee29b85..9cb39a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -220,4 +220,51 @@
}
}
+ @Override
+ @Transactional
+ public void completeWrkMast(String workNo) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ // 鍏ュ簱 + 搴撲綅杞Щ
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ wrkMast.setWrkSts(4L);
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+ wrkMast.setWrkSts(14L);
+ }
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
+ }
+ }
+
+ @Override
+ @Transactional
+ public void cancelWrkMast(String workNo) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ // 鍏ュ簱
+ if (wrkMast.getWrkSts() < 4) {
+ if (wrkMast.getIoType() != 11) {
+
+ } else {
+ // 搴撲綅杞Щ
+
+
+ }
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+
+ }
+ // 鍒犻櫎宸ヤ綔妗�
+ wrkMastService.deleteById(wrkMast);
+ // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
+ // 淇敼搴撲綅鐘舵��
+// locMastService.updateById()
+ }
+
}
--
Gitblit v1.9.1