From 3f2b778ab3fbee3d851ed7033451cc008366ab4b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 13:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 0dc9485..bf59bde 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
@@ -70,8 +70,8 @@
public void InStockToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getType, OrderType.ORDER_IN.type)
- .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_EXCE.val)
- .apply("anfme = qty"));
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val)
+ );
if (wkOrders.isEmpty()) {
return;
}
@@ -183,13 +183,20 @@
});
params.setData(reportData);
- R reported = reportMsgService.reportOrders(params);
+ R reported = reportMsgService.uploadReportOrders(params);
if (reported.get("code").equals(200)) {
order.setNtyStatus(1);
if (!asnOrderService.updateById(order)) {
throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
+ try {
+ //浼戠湢3绉�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
});
}
@@ -205,7 +212,7 @@
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
//涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
-// reportOrders(wkOrders);
+ reportOrders(wkOrders);
//
Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
--
Gitblit v1.9.1