From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 16 +++++++++++-----
1 files changed, 11 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 cf82d5d..2fd0459 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,17 +12,21 @@
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);
@@ -30,4 +34,6 @@
OrderDetl selectContainBatch(String batch);
+ public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq);
+
}
--
Gitblit v1.9.1