From 1e1c329535e3f3ce253c89ae1847476de9058f27 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 10:05:00 +0800
Subject: [PATCH] ERP单据查询功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 ec5cd67..c78c9c7 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,7 +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));
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_EXCE.val)
+ .apply("anfme = qty"));
if (wkOrders.isEmpty()) {
return;
}
@@ -94,8 +95,8 @@
public void outStockComplete() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getType, OrderType.ORDER_OUT.type)
- .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
- .apply("anfme = qty")
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)
+
);
if (wkOrders.isEmpty()) {
return;
@@ -182,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);
+ }
+
});
}
@@ -204,8 +212,8 @@
@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>()
.in(WkOrderItem::getOrderId, longSet));
--
Gitblit v1.9.1