From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败

---
 src/main/java/com/zy/asrs/service/OrderDetlService.java |   20 +++++++++++++++-----
 1 files changed, 15 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 20cf173..2fd0459 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,18 +12,28 @@
 
     Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
 
-    OrderDetl selectItem(Long orderId, String matnr, String batch);
+    OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode);
 
-    OrderDetl selectItem(String orderNo, String matnr, String batch);
+    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