From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/third/task/OrderScheduler.java | 137 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/third/task/OrderScheduler.java b/src/main/java/com/zy/third/task/OrderScheduler.java
index c357a4c..5660b42 100644
--- a/src/main/java/com/zy/third/task/OrderScheduler.java
+++ b/src/main/java/com/zy/third/task/OrderScheduler.java
@@ -1,9 +1,17 @@
package com.zy.third.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl1;
+import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.third.entity.ExdInstockSource;
+import com.zy.third.entity.ExdInstockTarget;
import com.zy.third.entity.ExdOutstockSource;
+import com.zy.third.entity.ExdOutstockTarget;
import com.zy.third.mapper.ExdInstockSourceMapper;
import com.zy.third.mapper.ExdOutstockSourceMapper;
+import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockTargetService;
import com.zy.third.task.handler.OrderHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +35,16 @@
@Autowired
private ExdOutstockSourceMapper exdOutstockSourceMapper;
+
+ @Autowired
+ private ExdInstockTargetService exdInstockTargetService;
+
+ @Autowired
+ private ExdOutstockTargetService exdOutstockTargetService;
+ @Autowired
+ private OrderDetl1ServiceImpl orderDetl1ServiceImpl;
+ @Autowired
+ private OrderDetl1ServiceImpl orderDetl1Service;
/**
@@ -57,6 +75,42 @@
for (ExdInstockSource exdInstockSource : exdInstockSources) {
exdInstockSource.setReadormsg(e.getMessage());
exdInstockSource.setStatus(2);
+ exdInstockSourceMapper.updateById(exdInstockSource);
+ }
+ }
+ }
+ }
+
+ /**
+ * 璇诲彇鍏ュ簱鍗曟嵁锛屽erp鏍囪涓哄垹闄ょ殑璁㈠崟杩涜鍒犻櫎
+ * status 5 --銆� 8 鍒犻櫎鎴愬姛
+ * status 5 --銆� 7 鍒犻櫎澶辫触
+ */
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void deleteInOrder() {
+ //log.info("璇诲彇鍏ュ簱鍗曟嵁");
+ List<String> orderNos = exdInstockSourceMapper.deletelistOrderNo();
+ for (String orderNo : orderNos) {
+ List<ExdInstockSource> exdInstockSources = exdInstockSourceMapper.listAll(orderNo);
+ try {
+ boolean success = orderHandler.deletereadInOrder(exdInstockSources).isSuccess();
+ for (ExdInstockSource exdInstockSource : exdInstockSources) {
+ if (success) {
+ exdInstockSource.setReadtime(new Date());
+ exdInstockSource.setStatus(8);
+ exdInstockSourceMapper.updateById(exdInstockSource);
+ } else {
+ exdInstockSource.setReadtime(new Date());
+ exdInstockSource.setStatus(7);
+ exdInstockSourceMapper.updateById(exdInstockSource);
+ }
+ }
+ } catch (Exception e) {
+// log.error("璇诲彇鍏ュ簱鍗曟嵁淇℃伅澶辫触锛歿},{}", exdInstockSources, e.getMessage());
+ e.printStackTrace();
+ for (ExdInstockSource exdInstockSource : exdInstockSources) {
+ exdInstockSource.setReadormsg(e.getMessage());
+ exdInstockSource.setStatus(7);
exdInstockSourceMapper.updateById(exdInstockSource);
}
}
@@ -97,4 +151,87 @@
}
}
+ /**
+ * 璇诲彇鍒犻櫎鍑哄簱鍗曟嵁
+ */
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void deletereadOutOrder() {
+ //log.info("璇诲彇鍑哄簱鍗曟嵁");
+ List<String> orderNos = exdOutstockSourceMapper.deletelistOrderNo();
+ for (String orderNo : orderNos) {
+ List<ExdOutstockSource> exdOutstockSources = exdOutstockSourceMapper.listAll(orderNo);
+ try {
+ boolean success = orderHandler.deletereadOutOrder(exdOutstockSources).isSuccess();
+ for (ExdOutstockSource exdOutstockSource : exdOutstockSources) {
+ if (success) {
+ exdOutstockSource.setReadtime(new Date());
+ exdOutstockSource.setStatus(8);
+ exdOutstockSourceMapper.updateById(exdOutstockSource);
+ } else {
+ exdOutstockSource.setReadtime(new Date());
+ exdOutstockSource.setStatus(7);
+ exdOutstockSourceMapper.updateById(exdOutstockSource);
+ }
+ }
+ } catch (Exception e) {
+// log.error("璇诲彇鍑哄簱鍗曟嵁淇℃伅澶辫触锛歿},{}", exdOutstockSources, e.getMessage());
+ e.printStackTrace();
+ for (ExdOutstockSource exdOutstockSource : exdOutstockSources) {
+ exdOutstockSource.setStatus(7);
+ exdOutstockSource.setReadormsg(e.getMessage());
+ exdOutstockSourceMapper.updateById(exdOutstockSource);
+ }
+ }
+ }
+ }
+
+ /**
+ * 璇诲彇閿欒鍑哄簱瀹屾垚鍗曟嵁
+ */
+// @Scheduled(cron = "* 0/10 * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void readOutOrdererror() {
+ List<ExdOutstockTarget> status = exdOutstockTargetService.selectList(new EntityWrapper<ExdOutstockTarget>().isNotNull("ReadorMsg"));
+ if (status.size() > 0) {
+ for (ExdOutstockTarget exdOutstockTarget : status) {
+ List<OrderDetl1> orderNo = orderDetl1Service.selectList(new EntityWrapper<OrderDetl1>().eq("order_no", exdOutstockTarget.getFbillno()));
+ if (!Cools.isEmpty(orderNo)) {
+ for (OrderDetl1 orderDetl1 : orderNo) {
+ if (!Cools.isEmpty(orderDetl1.getMemo())&&orderDetl1.getMemo().equals(exdOutstockTarget.getReadormsg())) {
+ break;
+ }
+ orderDetl1.setMemo(exdOutstockTarget.getReadormsg());
+ orderDetl1Service.updateById(orderDetl1);
+ }
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 璇诲彇閿欒鍏ュ簱瀹屾垚鍗曟嵁
+ */
+ @Scheduled(cron = "* 0/10 * * * ? ")
+// @Scheduled(cron = "0/10 * * * * ? ")
+ public void readInOrdererror() {
+ List<ExdInstockTarget> status = exdInstockTargetService.selectList(new EntityWrapper<ExdInstockTarget>().isNotNull("ReadorMsg"));
+ if (status.size() > 0) {
+ for (ExdInstockTarget exdInstockTarget : status) {
+ List<OrderDetl1> orderNo = orderDetl1Service.selectList(new EntityWrapper<OrderDetl1>().eq("order_no", exdInstockTarget.getFbillno()));
+ if (!Cools.isEmpty(orderNo)) {
+ for (OrderDetl1 orderDetl1 : orderNo) {
+ if (orderDetl1.getMemo().equals(exdInstockTarget.getReadormsg())) {
+ break;
+ }
+ orderDetl1.setMemo(exdInstockTarget.getReadormsg());
+ orderDetl1Service.updateById(orderDetl1);
+ }
+ }
+
+ }
+ }
+
+ }
+
}
--
Gitblit v1.9.1