From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/java/com/zy/asrs/service/OrderDetlService.java |   10 ++++++++--
 1 files changed, 8 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 ecf08d2..cac22ca 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,9 +18,9 @@
 
     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);
 
@@ -37,4 +37,10 @@
      * @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