From 44522f08bff3abc3c34c77215eacd2cb3a484a0d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 14:07:51 +0800
Subject: [PATCH] 双伸出库优先筛选浅库位的任务进行出库，浅库位任务不足二十个则补上深库位出库的任务
---
src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index ba2d213..1bd53d3 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -12,21 +12,31 @@
Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page);
- OrderDetlPakout selectItem(Long orderId, String matnr, String batch);
+ OrderDetlPakout selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
- OrderDetlPakout selectItem(String orderNo, String matnr, String batch);
+ OrderDetlPakout selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
- OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch);
+ /**
+ * 寤惰繜鍑哄簱璁㈠崟鎸夋墭鐩樼敓鎴愪换鍔℃椂锛屽畬鎴愬洖鍐欎紭鍏堢敤 orderNo + palletId 绮剧‘瀹氫綅鏄庣粏銆�
+ */
+ OrderDetlPakout selectItemByOrderNoAndPallet(String orderNo, String palletId);
- boolean increase(Long orderId, String matnr, String batch, Double qty);
+ OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
- boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
+
+ boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetlPakout orderDetl);
- boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
+
+ /**
+ * 鎸夎鍗曞彿鍜屾墭鐩樺彿閫掑瀹屾垚鏁伴噺 qty锛泈ork_qty 鍙〃绀轰换鍔＄敓鎴愭暟閲忥紝涓嶅湪杩欓噷鏇存柊銆�
+ */
+ boolean increaseQtyByOrderNoAndPallet(String orderNo, String palletId, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -36,5 +46,5 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty);
}
--
Gitblit v1.9.1