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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 bf59bde..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
@@ -136,6 +136,7 @@
                 //璁剧疆閫氱敤鍙傛暟
                 param.setWMSNO(order.getCode())
                         .setPONO(order.getPoCode())
+                        .setOrderNO(order.getPoCode())
                         .setOrderDate(order.getCreateTime())
                         .setItemCode(orderItem.getMatnrCode())
                         .setEditUser(nickName)
@@ -168,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());

--
Gitblit v1.9.1