From 1a2f494454d0da24bb9ca7ad7c0e91902819405a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 21 十一月 2025 13:18:42 +0800
Subject: [PATCH] 1.获取erp订单数据时过滤掉状态》5 2.同步erp删除数据时，只删除指定的订单明细 3.订单出库按批号排序
---
src/main/java/com/zy/third/task/OrderScheduler.java | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/third/task/OrderScheduler.java b/src/main/java/com/zy/third/task/OrderScheduler.java
index 5660b42..253bd4b 100644
--- a/src/main/java/com/zy/third/task/OrderScheduler.java
+++ b/src/main/java/com/zy/third/task/OrderScheduler.java
@@ -89,12 +89,10 @@
@Scheduled(cron = "0/10 * * * * ? ")
public void deleteInOrder() {
//log.info("璇诲彇鍏ュ簱鍗曟嵁");
- List<String> orderNos = exdInstockSourceMapper.deletelistOrderNo();
- for (String orderNo : orderNos) {
- List<ExdInstockSource> exdInstockSources = exdInstockSourceMapper.listAll(orderNo);
+ List<ExdInstockSource> exdInstockSources = exdInstockSourceMapper.deletelistOrderNo();
+ for (ExdInstockSource exdInstockSource : exdInstockSources) {
try {
- boolean success = orderHandler.deletereadInOrder(exdInstockSources).isSuccess();
- for (ExdInstockSource exdInstockSource : exdInstockSources) {
+ boolean success = orderHandler.deletereadInOrder(exdInstockSource).isSuccess();
if (success) {
exdInstockSource.setReadtime(new Date());
exdInstockSource.setStatus(8);
@@ -104,17 +102,18 @@
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);
- }
+ exdInstockSource.setReadormsg(e.getMessage());
+ exdInstockSource.setStatus(7);
+ exdInstockSourceMapper.updateById(exdInstockSource);
+
}
}
+
+
}
/**
@@ -157,32 +156,28 @@
@Scheduled(cron = "0/10 * * * * ? ")
public void deletereadOutOrder() {
//log.info("璇诲彇鍑哄簱鍗曟嵁");
- List<String> orderNos = exdOutstockSourceMapper.deletelistOrderNo();
- for (String orderNo : orderNos) {
- List<ExdOutstockSource> exdOutstockSources = exdOutstockSourceMapper.listAll(orderNo);
+ List<ExdOutstockSource> exdOutstockSources = exdOutstockSourceMapper.deletelistOrderNo();
+ for (ExdOutstockSource exdOutstockSource : exdOutstockSources) {
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);
- }
+ boolean success = orderHandler.deletereadOutOrder(exdOutstockSource).isSuccess();
+ 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);
- }
+ exdOutstockSource.setStatus(7);
+ exdOutstockSource.setReadormsg(e.getMessage());
+ exdOutstockSourceMapper.updateById(exdOutstockSource);
}
}
+
}
/**
@@ -197,7 +192,7 @@
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())) {
+ if (!Cools.isEmpty(orderDetl1.getMemo()) && orderDetl1.getMemo().equals(exdOutstockTarget.getReadormsg())) {
break;
}
orderDetl1.setMemo(exdOutstockTarget.getReadormsg());
--
Gitblit v1.9.1