From 9a3370c0ba5e04b0f48148eeafe6cec0b1ab9590 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 08:44:19 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/orderPakout/out.js | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 42 ++++++++++++++++++++----------------------
src/main/webapp/static/js/wrkMast/wrkMast.js | 11 +++++++----
src/main/java/com/zy/asrs/controller/WorkController.java | 2 ++
4 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6de7c6e..fc0d3e7 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -166,6 +166,8 @@
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ } else if (type == 4) {
+ workService.backLocOperation(workNo, getUserId());
}
return R.ok();
}
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 9257903..2120202 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -454,7 +454,7 @@
throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
}
- List<LocAroundBind> binds = locAroundBindService.selectList( new EntityWrapper<LocAroundBind>()
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
.eq("dev_no", basDevice.getDevNo())
.eq("is_default", 1));
@@ -1324,25 +1324,26 @@
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
Integer ioType = wrkMast.getIoType() - 50;
- int wokNo = wrkMast.getWrkNo();
+// int wokNo = wrkMast.getWrkNo();
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
- if (Objects.isNull(wrkMast.getWrkCode())) {
- if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
- throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
- }
- // 宸ヤ綔鐘舵�佸垽鏂�
- if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
- }
- } else {
- if (wrkMast.getIoType() == 103) {
- ioType = 1;
- } else if (wrkMast.getIoType() == 101) {
- ioType = 10;
- }
-
- wokNo = commonService.getWorkNo(0);
+// if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
}
+ // 宸ヤ綔鐘舵�佸垽鏂�
+ if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
+ throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
+ }
+// }
+
+// else {
+// if (wrkMast.getIoType() == 103) {
+// ioType = 1;
+// } else if (wrkMast.getIoType() == 101) {
+// ioType = 10;
+// }
+// wokNo = commonService.getWorkNo(0);
+// }
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
@@ -1390,7 +1391,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void backLocOperation(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)) {
@@ -1440,7 +1441,6 @@
if (Cools.isEmpty(wrkDetls)) {
throw new CoolException("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
}
-
wrkDetls.forEach(wrkDetl -> {
WrkDetl wrkDetl1 = new WrkDetl();
BeanUtils.copyProperties(wrkDetl, wrkDetl1);
@@ -1459,8 +1459,6 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
}
-
-
@Override
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 61fd8e5..b30a32f 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -159,7 +159,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'standby1', title: '鏈哄彴鍙�', align: 'center'},
+ {field: 'standby1', title: '鏈哄彴鍙�', align: 'center', edit: true},
{
field: 'anfme',
title: '鏁伴噺',
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index f9674da..c8c35a1 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -293,10 +293,13 @@
break;
//绌烘澘鍥炲簱
case 'empty':
- layer.confirm('绌烘澘鍏ュ簱璇ョ瑪宸ヤ綔妗�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function () {
- http.post()
- })
- layer.closeAll();
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
--
Gitblit v1.9.1