From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 1a7f9c1..02ee354 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,6 +18,8 @@
OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode);
+ OrderDetl selectItem(String orderNo, String matnr, String threeCode);
+
OrderDetl selectItemNoneOfBatch(String orderNo, String matnr);
OrderDetl selectItemOfBatch(String matnr, String batch);
--
Gitblit v1.9.1