From 41326b3129ae3e4ef7a45bc16dba64dc9dd27404 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 04 九月 2024 09:58:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp

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

diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 73740a9..1a7f9c1 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,19 +12,31 @@
 
     Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
 
-    OrderDetl selectItem(Long orderId, String matnr, String batch);
+    Page<OrderDetl> getOrderDetlByDoctype(Page<OrderDetl> page);
 
-    OrderDetl selectItem(String orderNo, String matnr, String batch);
+    OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode);
+
+    OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode);
+
+    OrderDetl selectItemNoneOfBatch(String orderNo, String matnr);
+
+    OrderDetl selectItemOfBatch(String matnr, String batch);
 
     OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
 
-    boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty);
+    boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode);
 
-    boolean increase(Long orderId, String matnr, String batch, Double qty);
+    boolean increase(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode);
 
-    boolean decrease(String orderNo, String matnr, String batch, Double qty);
+    boolean decrease(String orderNo, String matnr, String batch, Double qty, String csocode, String isoCode);
 
     boolean modifyStatus(Long orderId, Integer status);
 
     List<OrderDetl> selectRemainder(Long orderId);
+
+    OrderDetl selectContainBatch(String batch);
+
+    public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq);
+
+
 }

--
Gitblit v1.9.1