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 | 9 +++++----
1 files changed, 5 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 13ebb7a..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,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_DONE.val)
+ );
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,7 +183,7 @@
});
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)) {
--
Gitblit v1.9.1