From ac852588e581738264639e832dab13b926d47132 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 02 十一月 2025 19:54:26 +0800
Subject: [PATCH] #新增 1. 出库单生成fieldsIndex
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 6b751a0..cde6838 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;
@@ -115,7 +116,10 @@
*/
@Transactional(rollbackFor = Exception.class)
public void reportOrders(List<WkOrder> orders) {
- orders.forEach(order -> {
+ for (WkOrder order : orders) {
+ if (order.getReportOnce() > 4 || order.getNtyStatus() == 1) {
+ continue;
+ }
ReportParams params = new ReportParams();
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
if (orderItems.isEmpty()) {
@@ -135,6 +139,7 @@
//璁剧疆閫氱敤鍙傛暟
param.setWMSNO(order.getCode())
.setPONO(order.getPoCode())
+ .setOrderNO(order.getPoCode())
.setOrderDate(order.getCreateTime())
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
@@ -167,8 +172,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("WO_Outstock_WR").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,14 +189,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("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ order.setNtyStatus(1).setReportOnce(order.getReportOnce() + 1) ;
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
- });
+ try {
+ //浼戠湢3绉�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--
Gitblit v1.9.1