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/impl/OrderDetlServiceImpl.java |    7 +++++++
 1 files changed, 7 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..4695d23 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,13 @@
     }
 
     @Override
+    public OrderDetl selectItem(String orderNo, String matnr,String batch, String threeCode) {
+        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
+    }
+
+
+
+    @Override
     public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
         return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
     }

--
Gitblit v1.9.1