From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +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 | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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..cedfb6a 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;
@@ -135,6 +136,7 @@
//璁剧疆閫氱敤鍙傛暟
param.setWMSNO(order.getCode())
.setPONO(order.getPoCode())
+ .setOrderNO(order.getPoCode())
.setOrderDate(order.getCreateTime())
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
@@ -167,8 +169,10 @@
//鐢熶骇琛ユ枡
params.setOrderType("WR_Instock_BL").setAction("Update");
param.setOutQty(orderItem.getQty());
-
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
+ }else if ( order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
+ params.setOrderType("WR_Instock_BL").setAction("Update");
+ param.setOutQty(orderItem.getQty());
+ }else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
//鍏跺畠鍏ュ簱鍗�/鎵嬪姩鍏ュ簱鍗�
params.setOrderType("In_Instock").setAction("Update");
param.setInQty(orderItem.getQty());
@@ -182,13 +186,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 +216,7 @@
public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
//涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
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