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