From e3bb506579f395c5dbca3d9f0e1e10a18170240f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 四月 2021 15:01:15 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java | 35 +++++++++++++++++
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 | 11 ++++-
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 12 ++++++
src/main/webapp/static/js/check/check.js | 28 ++++++++++++++
version/v1.0.1/log.sql | 0
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 2
src/main/resources/application.yml | 2
10 files changed, 88 insertions(+), 8 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 1ee65f0..70383e2 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
@@ -424,7 +424,7 @@
public void getOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
- json.put("vchType", 151);
+ json.put("vchType", 11);
String response = new HttpHandler.Builder()
.setUri(URI)
.setPath(GET_ORDERS)
@@ -747,7 +747,7 @@
public void getCancelOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
- json.put("vchType", 151);
+ json.put("vchType", 11);
json.put("flag", 2);
String response = new HttpHandler.Builder()
.setUri(URI)
@@ -769,8 +769,13 @@
existNumbers.add(result0.getNumber());
}
for (String number : existNumbers) {
- if (!orderService.updateSettle(number, 5L)) {
+ Order order = orderService.selectByOrderNo(number);
+ 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/common/service/task/OrderScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
index fd9a5b7..fa67b3b 100644
--- a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +28,40 @@
private OrderService orderService;
@Autowired
private PakoutService pakoutService;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ /**
+ * 璁㈠崟杞巻鍙叉。澶勭悊鍣�
+ */
+ @Transactional
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void orderBeLogExecute(){
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().in("settle", 3, 6));
+ for (Order order : orders) {
+ // 淇濆瓨璁㈠崟鍘嗗彶妗�
+ int saveOrderLog = jdbcTemplate.update("insert into man_order_log select * from man_order where id=" + order.getId());
+ if (saveOrderLog == 0) {
+ throw new CoolException("淇濆瓨璁㈠崟鍘嗗彶妗ｅけ璐�");
+ }
+ // 淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗�
+ int saveOrderDetlLog = jdbcTemplate.update("insert into man_order_detl_log select * from man_order_detl where order_id=" + order.getId());
+ if (saveOrderDetlLog == 0) {
+ throw new CoolException("淇濆瓨璁㈠崟鍘嗗彶妗ｅけ璐�");
+ }
+ // 鍒犻櫎璁㈠崟
+ int delOrder = jdbcTemplate.update("delete from man_order where id=" + order.getId());
+ if (delOrder == 0) {
+ throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
+ }
+ // 鍒犻櫎璁㈠崟鏄庣粏
+ int delOrderDetl = jdbcTemplate.update("delete from man_order_detl where order_id=" + order.getId());
+ if (delOrderDetl == 0) {
+ 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/resources/application.yml b/src/main/resources/application.yml
index c306db6..3e28d08 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -53,4 +53,4 @@
endpoint: http://oss-cn-hangzhou.aliyuncs.com
asrs:
- baseUrl: http://192.168.110.56:8080/htwms
\ No newline at end of file
+ baseUrl: http://localhost:8081/htwms
\ No newline at end of file
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 570a39a..1f05355 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -206,7 +206,7 @@
</select>
<select id="getStockByDocType34" resultType="java.lang.Double">
- select ISNULL(count(anfme),0) as anfme from man_loc_detl where matnr = #{matnr}
+ select ISNULL(sum(anfme),0) as anfme from man_loc_detl where matnr = #{matnr}
-- and doc_id = 34
</select>
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>
diff --git a/version/v1.0.1/log.sql b/version/v1.0.1/log.sql
new file mode 100644
index 0000000..e1dda75
--- /dev/null
+++ b/version/v1.0.1/log.sql
Binary files differ
--
Gitblit v1.9.1