From 43a40046a19a5e5c1b443017ce31ece34e1d7460 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 四月 2021 14:48:44 +0800
Subject: [PATCH] #批量审核盘点记录
---
src/main/webapp/views/check/check.html | 2 +-
src/main/java/zy/cloud/wms/manager/entity/Check.java | 2 +-
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 7 ++++---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 12 ++++++++++++
src/main/webapp/static/js/check/check.js | 28 ++++++++++++++++++++++++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 2 +-
6 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index f0c48c5..66a60f2 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -770,12 +770,13 @@
}
for (String number : existNumbers) {
Order order = orderService.selectByOrderNo(number);
- if (order.getSettle() != 3L && order.getSettle() != 5L) {
- if (!orderService.updateSettle(number, 5L)) {
+ if (order != null) {
+ if (order.getSettle() != 3L && order.getSettle() != 5L) {
+ if (!orderService.updateSettle(number, 5L)) {
// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
}
}
-
}
}
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 e078fd1..6cc673a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -159,6 +159,18 @@
return workService.stockCheckAuditing(checkId, getUserId());
}
+ @RequestMapping("/stock/checks/auditing")
+ @ManagerAuth(memo = "鐩樼偣璁板綍鎵归噺瀹℃牳")
+ public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
+ int success = 0;
+ for (Long checkId : checkIds) {
+ R r = workService.stockCheckAuditing(checkId, getUserId());
+ if (String.valueOf(r.get("code")).equals("200")) {
+ success ++;
+ }
+ }
+ return R.ok("瀹℃牳鎴愬姛鏁伴噺锛�" + success);
+ }
/******************************************************************************************************/
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Check.java b/src/main/java/zy/cloud/wms/manager/entity/Check.java
index 1692c47..0af6a05 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Check.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Check.java
@@ -116,7 +116,7 @@
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "鐘舵�� 1: 寰呭鏍� 2: 宸查�氳繃 0: 鍙栨秷 ")
private Integer status;
/**
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 fb302a3..c7b9c42 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
@@ -708,7 +708,7 @@
@Transactional
public R stockCheckAuditing(Long checkId, Long userId) {
Check check = checkService.selectById(checkId);
- if (null == check) {
+ if (null == check || check.getStatus() != 1) {
return R.error("鐩樼偣璁板綍宸插け鏁�");
}
Date now = new Date();
diff --git a/src/main/webapp/static/js/check/check.js b/src/main/webapp/static/js/check/check.js
index 2e106af..e3b2efb 100644
--- a/src/main/webapp/static/js/check/check.js
+++ b/src/main/webapp/static/js/check/check.js
@@ -102,6 +102,34 @@
table.on('toolbar(check)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
+ // 鎵归噺瀹℃牳
+ case 'batchAuditing':
+ var checkIds = checkStatus.data.map(function (d) {
+ return d.id;
+ });
+ if (checkIds.length === 0) {
+ layer.msg('璇烽�夋嫨鏁版嵁', {icon: 3});
+ } else {
+ var index = layer.load(1, {shade: [0.1,'#000']});
+ $.ajax({
+ url: baseUrl+"/work/stock/checks/auditing",
+ headers: {'token': localStorage.getItem('token')},
+ data: {checkIds: checkIds},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1})
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ layer.close(index);
+ }
+ });
+ }
+ break;
case 'addData':
layer.open({
type: 2,
diff --git a/src/main/webapp/views/check/check.html b/src/main/webapp/views/check/check.html
index 14fee00..72f5d65 100644
--- a/src/main/webapp/views/check/check.html
+++ b/src/main/webapp/views/check/check.html
@@ -72,7 +72,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+ <button class="layui-btn layui-btn-normal" id="btn-add" lay-event="batchAuditing">鎵归噺瀹℃牳</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
--
Gitblit v1.9.1