From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/java/com/zy/asrs/service/OpenService.java | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 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 45df305..e01608b 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,10 +1,12 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import java.util.Map;
import java.util.List;
public interface OpenService {
@@ -25,6 +27,16 @@
void pakoutOrderCreate(OpenOrderPakoutParam param);
/**
+ * pause out order
+ */
+ R pakoutOrderPause(OpenOrderPakoutPauseParam param);
+
+ /**
+ * execute out order
+ */
+ R pakoutOrderExecute(OpenOrderPakoutExecuteParam param);
+
+ /**
* 鍏ュ簱鍗曞洖鍐�
*/
List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
@@ -33,6 +45,11 @@
* 搴撳瓨缁熻
*/
List<StockVo> queryStock();
+
+ /**
+ * 鎸夋墭鐩樼爜鎵归噺閲嶆姤鍏ュ簱鍘嗗彶鍒� ERP銆�
+ */
+ R reportPakinHistoryToErp(List<String> barcodes);
// ------------------------------------------
@@ -50,14 +67,75 @@
void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param);
boolean TaskArmLocStatus(ArmOKParam param);
void taskArmWorkOrderStatus(OrderArmEndParam param);
- boolean TaskArmWorkOrderSign(OrderArmEndParam param);
- boolean TaskAgvReport(TaskAgvReportParam param);
- boolean taskAgvCreate(TaskAgvCreateParam param);
List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param);
boolean bindCtnrAndBin(bindCtnrAndBinParam param);
- boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
- boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
- boolean agvBindAndBin(String taskNo);
boolean taskArmOrderResult(OrderArmEndParam param);
List<PickWrkDetlListParam> getPickList(PdaPickListParam param);
+
+ /**
+ * 杈撳嚭鎵�鏈夊叆搴撶珯鍜屽嚭搴撶珯绔欑偣
+ * @return
+ */
+ R stationAll ();
+
+ /**
+ * 7.3 缁勬墭淇℃伅涓嬪彂
+ */
+ R mesToComb(MesToCombParam param);
+
+ /**
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
+ */
+ R outOrder(OutTaskParam param,int count,int i);
+
+ /**
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級鎵归噺寤哄崟锛屽悓涓�浜嬪姟锛氫换涓�琛屽け璐ュ垯鍏ㄩ儴鍥炴粴銆�
+ */
+ R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq,int count);
+
+ /**
+ * ERP / IoT 鍑哄簱閫氱煡鍏堢敓鎴愬嚭搴撹鍗曪紝涓嶇洿鎺ョ敓鎴愪换鍔°��
+ *
+ * 璇ユ柟娉曞彧璐熻矗鎶婃帴鍙ｅ弬鏁拌惤鍒� man_order_pakout / man_order_detl_pakout銆�
+ * 搴撲綅閿佸畾銆乄rkMast/WrkDetl 鍒涘缓鍜� WCS 涓嬪彂閮界暀缁欏悗缁畾鏃剁敓鎴愪换鍔℃祦绋嬪鐞嗐��
+ */
+ R outOrderCreatePakoutOrder(List<OutTaskParam> params);
+
+ /**
+ * 鍒涘缓鍑哄簱璁㈠崟锛屽苟鎸囧畾璁㈠崟鏄惁绔嬪嵆鍏佽瀹氭椂鍣ㄧ敓鎴愪换鍔°��
+ *
+ * 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锛涗换鍔℃壒娆￠敭鍦ㄥ疄鐜颁腑浼氬己鍒朵綔涓� WrkMast.batchSeq銆�
+ */
+ R generatePendingPakoutOrderTasks(String orderNo);
+
+ /**
+ * 7.9 鍑哄簱寮傚父鍙樺姩涓婃姤
+ */
+ R outOrderAbnormalReport(OutOrderAbnormalReportParam param);
+
+ /**
+ * 7.10 鍑哄簱寮傚父鍙樺姩澶勭悊
+ */
+ R outOrderAbnormalHandle(OutOrderAbnormalHandleParam param);
}
+
--
Gitblit v1.9.1