From 494c0066b28158a813953b66e3daa2abea313a87 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 29 九月 2022 10:46:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/wrkMast/wrkMast.html | 5 ++++-
src/main/java/com/zy/asrs/service/WrkMastService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 ++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 11 +++++++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 9 +++++++++
6 files changed, 35 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 eae764b..5eb4ebf 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping("/available/put/site")
@ManagerAuth()
@@ -158,4 +161,10 @@
return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
}
+ @RequestMapping("/deal/steNo/empty")
+ @ManagerAuth(memo = "娓呴櫎灏忚溅")
+ public R dealSteNoEmpty(@RequestParam Integer wrkNo) {
+ return wrkMastService.setSteEmpty(wrkNo)?R.ok():R.error();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 692d1b9..b8147d7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -21,4 +22,7 @@
WrkMast selectBySourceLocNoOfPakout(@Param("sourceLocNo") String sourceLocNo);
+ @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
+ int setSteEmpty(Integer wrkNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 99bedd0..f1a080c 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -23,4 +23,6 @@
* @return
*/
int getStoreCount(Integer crnNo);
+
+ Boolean setSteEmpty(Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index b5bd119..56a4450 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -101,4 +101,9 @@
.last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
}
+ @Override
+ public Boolean setSteEmpty(Integer wrkNo) {
+ return this.baseMapper.setSteEmpty(wrkNo) > 0;
+ }
+
}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..d10c803 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -30,6 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
@@ -346,6 +347,16 @@
layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
});
break;
+ // 寮冭溅
+ case 'removeSte':
+ layer.confirm('娓呴櫎灏忚溅銆�' + data.steNo + '銆�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/deal/steNo/empty", {wrkNo: data.wrkNo}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg, {icon: 1});
+ })
+ layer.closeAll();
+ });
+ break;
}
});
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 77b804b..440449f 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -126,7 +126,10 @@
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
{{# } }}
{{#if (d.ioType === 107) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
+ {{# } }}
+ {{#if (d.steNo) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">寮冭溅</a>
{{# } }}
</script>
--
Gitblit v1.9.1