From 5ec416d5886273ae2d9eed3e7ab2c1c286a361a3 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:52 +0800
Subject: [PATCH] 打开上报接口

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java |   14 ++++++++------
 1 files changed, 8 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 72fc597..7290152 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;
         }
@@ -168,8 +168,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());
@@ -183,7 +185,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)) {
@@ -212,7 +214,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