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/impl/OrderDetlServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 9b99ae0..b0e109e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -48,6 +48,11 @@
}
@Override
+ public OrderDetl selectItem(String orderNo, String matnr, String threeCode) {
+ return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, threeCode);
+ }
+
+ @Override
public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
}
--
Gitblit v1.9.1