From 48d6b46ef23a321cc70e20d36a2b3bf721d05206 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:45:57 +0800
Subject: [PATCH] 电视机显示屏曲线图改成7天

---
 src/main/java/com/zy/asrs/service/OpenService.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index e8cfe03..d6549c7 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -6,6 +6,7 @@
 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 {
@@ -26,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);
@@ -34,6 +45,11 @@
      * 搴撳瓨缁熻
      */
     List<StockVo> queryStock();
+
+    /**
+     * 鎸夋墭鐩樼爜鎵归噺閲嶆姤鍏ュ簱鍘嗗彶鍒� ERP銆�
+     */
+    R reportPakinHistoryToErp(List<String> barcodes);
 
     // ------------------------------------------
 
@@ -63,11 +79,50 @@
     R stationAll ();
 
     /**
-     * mes鍙戠粍鎵樻。缁欏埌wms
+     * 7.3 缁勬墭淇℃伅涓嬪彂
      */
     R mesToComb(MesToCombParam param);
+
     /**
-     *
+     * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
      */
-    R outOrder(OutTaskParam  param);
+    R outOrder(OutTaskParam  param,int count,int i);
+
+    /**
+     * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級鎵归噺寤哄崟锛屽悓涓�浜嬪姟锛氫换涓�琛屽け璐ュ垯鍏ㄩ儴鍥炴粴銆�
+     */
+    R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq,int count);
+
+    /**
+     * stationId > 600 鐨勫嚭搴撻�氱煡鍗曞厛鐢熸垚鍑哄簱璁㈠崟锛屼笉鐩存帴鐢熸垚浠诲姟銆�
+     *
+     * 璇ユ柟娉曞彧璐熻矗鎶� ERP 鍙傛暟钀藉埌 man_order_pakout / man_order_detl_pakout銆�
+     * 搴撲綅閿佸畾銆乄rkMast/WrkDetl 鍒涘缓鍜� WCS 涓嬪彂閮界暀缁欏悗缁畾鏃剁敓鎴愪换鍔℃祦绋嬪鐞嗐��
+     */
+    R outOrderCreatePakoutOrder(List<OutTaskParam> params);
+
+    /**
+     * 鎵弿寰呯敓鎴愪换鍔$殑鍑哄簱璁㈠崟锛屾寜杩涗粨缂栧彿鎵归噺鐢熸垚浠诲姟銆�
+     *
+     * 璋冨害鍣ㄥ叆鍙o細浼氶亶鍘嗗惎鐢ㄤ腑鐨勫嚭搴撹鍗曪紝姣忎釜璁㈠崟鏈�澶氱敓鎴愪竴涓綋鍓嶅彲鏀捐鐨� entryWmsCode 鎵规銆�
+     */
+    R generatePendingPakoutOrderTasks();
+
+    /**
+     * 鐢熸垚鎸囧畾鍑哄簱璁㈠崟褰撳墠鍏佽鐨勪竴涓繘浠撶紪鍙锋壒娆′换鍔°��
+     *
+     * orderNo 瀵瑰簲 WrkMast.userNo锛沞ntryWmsCode 鍦ㄥ疄鐜颁腑浼氬己鍒朵綔涓� WrkMast.batchSeq銆�
+     */
+    R generatePendingPakoutOrderTasks(String orderNo);
+
+    /**
+     * 7.9 鍑哄簱寮傚父鍙樺姩涓婃姤
+     */
+    R outOrderAbnormalReport(OutOrderAbnormalReportParam param);
+
+    /**
+     * 7.10 鍑哄簱寮傚父鍙樺姩澶勭悊
+     */
+    R outOrderAbnormalHandle(OutOrderAbnormalHandleParam param);
 }
+

--
Gitblit v1.9.1