From 429ad2a69af32668782221b1abb4273acbe7bd8e Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期二, 14 四月 2026 22:01:33 +0800
Subject: [PATCH] 上报 ERP 重量:≤20 传 0,>20 减 20.8

---
 src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
index 433efdb..e7b5785 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
@@ -52,6 +52,10 @@
     @Value("${erp.address.Outaddress}")
     private String erpOutAddress;
 
+    /**
+     * 7.7 鍑哄簱瀹屾垚鏇存柊銆�
+     * WMS 鍦ㄥ嚭搴撳畬鎴愬悗鍚� ERP 涓婃姤 palletId銆乧reateTime銆乻tartTime銆乷rderId銆�
+     */
     @Transactional(rollbackFor = Exception.class)
     public ReturnT<String> start(WrkMast source) {
         WrkMast wrkMast = wrkMastService.selectById(source.getWrkNo());
@@ -65,6 +69,13 @@
         }
 
         ErpPakoutReportParam param = buildParam(wrkMast);
+        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+        if (wrkDetls != null && wrkDetls.size() > 0) {
+            param.setOrderId(wrkDetls.get(0).getOrderNo());
+        }
+        if (Cools.isEmpty(param.getOrderId())) {
+            param.setOrderId(wrkMast.getUserNo());
+        }
         String request = JSON.toJSONString(param);
         String response = "";
         boolean success = false;

--
Gitblit v1.9.1