From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档,新增了几个字段需要加入到组托档中,不额外加字段 2.针对7.11接口文档,对outOrder方法进行重写,batchSeq在wrkMast表中新增一个字段放,entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档,上报时加上orderId出库单号 4.针对7.9接口文档,wcs会先请求wms,只需要palletId托盘码,errorMsg错误信息;wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档,ERP先按照这个文档发给wms,wms再发给wcs,发给wcs这块先不写

---
 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