From 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 08:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 6 ++++--
1 files changed, 4 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 53e6e05..8eb61e2 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);
@@ -39,4 +39,6 @@
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
Boolean checkAllDetlFinish(String orderNo);
+
+ Integer sameOrderComb(String orderNo, String matnr, String batch);
}
--
Gitblit v1.9.1