From 502360f2af9d5f2120412afaa888c67c9911a741 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 09:35:01 +0800
Subject: [PATCH] agv工作档转出库任务
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 16 ++++++++++++++++
src/main/webapp/views/agvWrkMast/wrkMast.html | 1 +
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 3 +++
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 11 +++++++++++
src/main/java/com/zy/asrs/service/AgvWorkService.java | 5 +++++
5 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
index 54ffa2d..1b1417d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -51,6 +51,9 @@
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.changeToOutWrkMast(workNo,getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡杞垚鍑哄簱浠诲姟锛屽苟涓斿鍣ㄧ鍦烘垚鍔�");
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 96c64c7..b3ddaa6 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -59,4 +59,9 @@
*/
void cancelWrkMast(String workNo, Long userId);
+ /*
+ 鎵嬪姩杞嚭搴撲换鍔★紝骞朵笖瀹瑰櫒绂诲満
+ */
+ void changeToOutWrkMast(String workNo, Long userId);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 05ae409..5abd58d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -597,6 +597,22 @@
}
+ @Override
+ public void changeToOutWrkMast(String workNo, Long userId) {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectById(workNo);
+ if (Cools.isEmpty(agvWrkMast)){
+ throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+
+ agvWrkMast.setIoType(101);
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
+ agvWrkMast.setModiUser(userId);
+
+ agvWrkMastService.updateById(agvWrkMast);
+
+ }
+
/*
鏇存柊鐩爣搴撲綅淇℃伅
*/
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index 63ae9f5..1209d96 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -348,6 +348,17 @@
});
}
break;
+ // 杞嚭搴撲换鍔★紝骞朵笖浠诲姟瀹屾垚
+ case 'changeToOut':
+ layer.confirm('纭灏嗚绗斾换鍔¤浆鎴愬嚭搴撲换鍔★紝骞朵笖瀹瑰櫒绂诲満锛�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+
+ });
+ break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index 0f57944..6e3ee3f 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -122,6 +122,7 @@
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-out" lay-event="changeToOut">杞嚭搴�</a>
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
{{#if (d.steNo) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">寮冭溅</a>
--
Gitblit v1.9.1