From b0877a3275ed5bc96fb80f84949904e149946cf2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 19:37:51 +0800
Subject: [PATCH] 将erp下发直接生成任务改成先生成订单再出库
---
src/main/java/com/zy/asrs/service/OpenService.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index d6549c7..e01608b 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -94,24 +94,37 @@
R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq,int count);
/**
- * stationId > 600 鐨勫嚭搴撻�氱煡鍗曞厛鐢熸垚鍑哄簱璁㈠崟锛屼笉鐩存帴鐢熸垚浠诲姟銆�
+ * ERP / IoT 鍑哄簱閫氱煡鍏堢敓鎴愬嚭搴撹鍗曪紝涓嶇洿鎺ョ敓鎴愪换鍔°��
*
- * 璇ユ柟娉曞彧璐熻矗鎶� ERP 鍙傛暟钀藉埌 man_order_pakout / man_order_detl_pakout銆�
+ * 璇ユ柟娉曞彧璐熻矗鎶婃帴鍙ｅ弬鏁拌惤鍒� man_order_pakout / man_order_detl_pakout銆�
* 搴撲綅閿佸畾銆乄rkMast/WrkDetl 鍒涘缓鍜� WCS 涓嬪彂閮界暀缁欏悗缁畾鏃剁敓鎴愪换鍔℃祦绋嬪鐞嗐��
*/
R outOrderCreatePakoutOrder(List<OutTaskParam> params);
/**
- * 鎵弿寰呯敓鎴愪换鍔＄殑鍑哄簱璁㈠崟锛屾寜杩涗粨缂栧彿鎵归噺鐢熸垚浠诲姟銆�
+ * 鍒涘缓鍑哄簱璁㈠崟锛屽苟鎸囧畾璁㈠崟鏄惁绔嬪嵆鍏佽瀹氭椂鍣ㄧ敓鎴愪换鍔°��
*
- * 璋冨害鍣ㄥ叆鍙ｏ細浼氶亶鍘嗗惎鐢ㄤ腑鐨勫嚭搴撹鍗曪紝姣忎釜璁㈠崟鏈�澶氱敓鎴愪竴涓綋鍓嶅彲鏀捐鐨� entryWmsCode 鎵规銆�
+ * executable=true锛氳鍗� status=1锛岄�傜敤浜� ERP /outOrder锛屽垱寤哄悗鑷姩鐢熸垚骞朵笅鍙戙��
+ * executable=false锛氳鍗� status=0锛岄�傜敤浜� IoT/MQTT 棰勫垱寤猴紝蹇呴』璋冪敤鎵ц鎺ュ彛鍚庢墠鐢熸垚浠诲姟銆�
+ *
+ * 璇ュ紑鍏冲彧鎺у埗鈥滄槸鍚﹀厑璁哥敓鎴愬悗缁换鍔♀�濓紝涓嶄唬琛ㄨ鍗曞畬鎴愮姸鎬侊細
+ * - 璁㈠崟瀹屾垚杩涘害浠嶇敱 settle 鍜屾槑缁� work_qty/qty 鍒ゆ柇锛�
+ * - 涓/鎭㈠缁х画澶嶇敤鍚屼竴涓� status 瀛楁锛岄伩鍏嶆柊澧炴暟鎹簱瀛楁銆�
+ */
+ R outOrderCreatePakoutOrder(List<OutTaskParam> params, boolean executable);
+
+ /**
+ * 鎵弿寰呯敓鎴愪换鍔＄殑鍑哄簱璁㈠崟锛屾寜浠诲姟鎵规閿壒閲忕敓鎴愪换鍔°��
+ *
+ * 璋冨害鍣ㄥ叆鍙ｏ細浼氶亶鍘嗗惎鐢ㄤ腑鐨勫嚭搴撹鍗曪紝姣忎釜璁㈠崟鏈�澶氱敓鎴愪竴涓綋鍓嶅彲鏀捐鐨勬壒娆°��
+ * 楂樼珯鐐规壒娆￠敭涓� entryWmsCode锛涗綆绔欑偣鎵规閿负 orderNo銆�
*/
R generatePendingPakoutOrderTasks();
/**
- * 鐢熸垚鎸囧畾鍑哄簱璁㈠崟褰撳墠鍏佽鐨勪竴涓繘浠撶紪鍙锋壒娆′换鍔°��
+ * 鐢熸垚鎸囧畾鍑哄簱璁㈠崟褰撳墠鍏佽鐨勪竴涓壒娆′换鍔°��
*
- * orderNo 瀵瑰簲 WrkMast.userNo锛沞ntryWmsCode 鍦ㄥ疄鐜颁腑浼氬己鍒朵綔涓� WrkMast.batchSeq銆�
+ * orderNo 瀵瑰簲 WrkMast.userNo锛涗换鍔℃壒娆￠敭鍦ㄥ疄鐜颁腑浼氬己鍒朵綔涓� WrkMast.batchSeq銆�
*/
R generatePendingPakoutOrderTasks(String orderNo);
--
Gitblit v1.9.1