From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 19 ++++++++++++++-----
1 files changed, 14 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..2fd0459 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,19 +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