From fffb817cc80e3a20913e1c8073e39daaa8c58f63 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 16:09:56 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index a521c98..30b654a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -64,7 +64,7 @@
* @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @time 2025/3/19 19:09
*/
- @Scheduled(cron = "0/35 * * * * ? ")
+ @Scheduled(cron = "0 0 2 1 * ?")
@Transactional(rollbackFor = Exception.class)
public void InStockToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
@@ -89,7 +89,8 @@
* @description 鍑哄簱鍗曞畬鎴愬悗锛岀姸鎬佷慨鏀�
* @time 2025/6/16 08:35
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/15 * * * * ? ")
+// @Scheduled(cron = "0 0 2 1 * ?")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
@@ -141,7 +142,7 @@
log.error(e.getMessage());
}
}
- if (order.getNtyStatus().equals(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val)) {
+ if (order.getType().equals(OrderType.ORDER_OUT.type) && order.getReportOnce() >= 4) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
if (Objects.isNull(one)) {
AsnOrderLog orderLog = new AsnOrderLog();
@@ -225,13 +226,13 @@
}
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.asnOrderService.removeById(order.getId())) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
+// if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+// .eq(WkOrderItem::getOrderId, order.getId()))) {
+// throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+// }
+// if (!this.asnOrderService.removeById(order.getId())) {
+// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+// }
}
}
}
--
Gitblit v1.9.1