From a041b056be31d3fe2fb045b1785dd0870f759744 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 28 十月 2024 11:00:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

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

diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 79ab5b0..cac22ca 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,7 +18,7 @@
 
     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 workQty);
 
@@ -41,4 +41,6 @@
     Boolean checkAllDetlFinish(String orderNo);
 
     Integer sameOrderComb(String orderNo, String matnr, String batch);
+
+    OrderDetl selectByOrderNoAndMaktx(String orderNo, String maktx);
 }

--
Gitblit v1.9.1