From 0ff66508469ce993b771fe63085f7039a430999c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:33:42 +0800
Subject: [PATCH] 1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示

---
 src/main/java/com/zy/asrs/service/OrderDetlService.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 8bef62f..cac22ca 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,11 +18,29 @@
 
     OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
 
-    boolean increase(Long orderId, String matnr, String batch, Double qty);
+    boolean increase(Long orderId, String matnr, String batch, Double workQty);
 
-    boolean decrease(String orderNo, String matnr, String batch, Double qty);
+    boolean decrease(String orderNo, String matnr, String batch, Double workQty);
 
     boolean modifyStatus(Long orderId, Integer status);
 
     boolean addToLogTable(OrderDetl orderDetl);
+
+    boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+
+    /**
+     * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+     * @param orderId
+     * @param matnr
+     * @param batch
+     * @param workQty
+     * @return
+     */
+    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+    Boolean checkAllDetlFinish(String orderNo);
+
+    Integer sameOrderComb(String orderNo, String matnr, String batch);
+
+    OrderDetl selectByOrderNoAndMaktx(String orderNo, String maktx);
 }

--
Gitblit v1.9.1