From 53524e38c61b150bd4d623e74343f9d839b5a0e6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 七月 2023 13:03:21 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMast/wrkMast.js | 51 ++++++++++++++++++-------
src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++++
2 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5eb4ebf..06d7262 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,8 +1,10 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
@@ -22,6 +24,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import static java.lang.Integer.parseInt;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -129,6 +133,16 @@
workService.adjustLocDetl(param, getUserId());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
+ @RequestMapping("/hand/query/wrkSts")
+ @ManagerAuth(memo = "鎵嬪姩鏌ヨ宸ヤ綔妗�")
+ public R queryWrkSts(@RequestParam String workNo,
+ @RequestParam Integer type){
+ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ wrapper.eq("wrk_no",parseInt(workNo));
+ WrkMast wrkMast = wrkMastService.selectOne(wrapper);
+
+ return R.ok().add(wrkMast);
+ }
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index dace171..03ea7a6 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -293,14 +293,27 @@
break;
// 瀹屾垚
case 'complete':
- layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
- $(".layui-laypage-btn")[0].click();
- layer.msg(data.wrkNo + res.msg);
- })
- layer.closeAll();
+ //鍏堟煡璇㈠伐浣滄。鐘舵��
+ let tit_text = ''
+ http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
+ var sts = res.data.wrkSts
+ if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
+ tit_text = '纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵'
+ } else {
+ tit_text = '褰撳墠浠诲姟鍦ㄨ繍琛屼腑锛岀‘璁ゅ畬鎴愯绗斿伐浣滄。锛�'
+ }
+ //$(".layui-laypage-btn")[0].click();
+ //layer.msg(data.wrkNo + res.msg);
+ console.log(tit_text)
+ layer.confirm(tit_text, {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
- });
+ });
+ })
break;
// 鍙栨秷
case 'cancel':
@@ -313,13 +326,23 @@
layer.closeAll();
});
} else {
- layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
- $(".layui-laypage-btn")[0].click();
- layer.msg(data.wrkNo + res.msg);
- })
- layer.closeAll();
- });
+ let tit_text = ''
+ http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
+ var sts = res.data.wrkSts
+ if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
+ tit_text = '纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵'
+ } else {
+ tit_text = '褰撳墠浠诲姟鍦ㄨ繍琛屼腑锛岀‘璁ゅ畬鎴愯绗斿伐浣滄。锛�'
+ }
+ layer.confirm(tit_text, {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ })
+
}
break;
// 鎷ｆ枡鍏ュ簱
--
Gitblit v1.9.1