From c923a3aca3cfb4da23eca4666ad7367b8aa3f217 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 09:22:06 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/CheckController.java | 3 +++
src/main/webapp/views/check/check.html | 2 ++
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 6 ++++++
src/main/webapp/static/js/check/check.js | 26 ++++++++++++++++++++++----
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 8 ++++++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 2 ++
6 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CheckController.java b/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
index 3abb691..9f64fee 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
@@ -44,6 +44,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("status").orderBy("create_time", false);
+ }
return R.ok(checkService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index aba5110..756728f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -150,4 +150,10 @@
return workService.stockCheck(param, getUserId());
}
+ @RequestMapping("/stock/check/auditing")
+ @ManagerAuth(memo = "鐩樼偣璁板綍瀹℃牳")
+ public R checkAuditing(@RequestParam Long checkId) {
+ return workService.stockCheckAuditing(checkId, getUserId());
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index c91135d..5334253 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -31,4 +31,6 @@
R stockCheck(StoCheckParam param, Long userId);
+ R stockCheckAuditing(Long checkId, Long userId);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index f72e187..1c8556f 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -533,4 +533,12 @@
return R.ok();
}
+ @Override
+ public R stockCheckAuditing(Long checkId, Long userId) {
+
+
+
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/static/js/check/check.js b/src/main/webapp/static/js/check/check.js
index 592cd02..7006cf9 100644
--- a/src/main/webapp/static/js/check/check.js
+++ b/src/main/webapp/static/js/check/check.js
@@ -208,11 +208,29 @@
break;
// 瀹℃牳
case 'auditing':
- layer.msg('瀹℃牳鎴愬姛', {icon : 1})
-
-
+ layer.confirm(data.nodeUuid +'璐т綅 鐩樼偣瀹℃牳 '+ data.matnr + ' ?', function(){
+ var index = layer.load(1, {shade: [0.5,'#000']});
+ $.ajax({
+ url: baseUrl+"/work/stock/check/auditing",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ checkId: data.id
+ },
+ dataType:'json',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ layer.close(index);
+ }
+ });
+ });
break;
-
}
});
diff --git a/src/main/webapp/views/check/check.html b/src/main/webapp/views/check/check.html
index 7e5a837..a328f90 100644
--- a/src/main/webapp/views/check/check.html
+++ b/src/main/webapp/views/check/check.html
@@ -55,7 +55,9 @@
</script>
<script type="text/html" id="operate">
+ {{#if (d.status == 1){ }}
<a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="auditing">瀹℃牳</a>
+ {{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
</script>
<script type="text/html" id="checkTpl">
--
Gitblit v1.9.1