From 67423b2d2a7216a1a9737114c0aebdf89cad8860 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 24 Jul 2024 09:24:05 +0800
Subject: [PATCH] =?UTF-8?q?24-05-16=20=E6=A0=87=E7=AD=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/OutboundLabelScanMapper.java          |  3 +++
 .../impl/OutboundLabelScanServiceImpl.java    | 11 ++++----
 .../production/OutboundLabelScanMapper.xml    | 26 +++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java b/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java
index 6194483..bd7c87a 100644
--- a/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java
@@ -14,4 +14,7 @@ public interface OutboundLabelScanMapper extends BaseMapper<OutboundLabelScan> {
     List<OutboundLabelScanData> searchOutboundLabelScanList(OutboundLabelScanData outboundLabelScanData);
 
     String getUserName(String createBy);
+
+    List<OutboundLabelScan> queryOutboundLabelScanList(OutboundLabelScan outboundLabelScan);
+
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java
index a53d0f1..97fe0fe 100644
--- a/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java
@@ -51,11 +51,12 @@ public class OutboundLabelScanServiceImpl extends ServiceImpl<OutboundLabelScanM
         if (Objects.isNull(outboundLabelScan)){
             throw new RuntimeException("请求参数错误");
         }
-        return lambdaQuery()
-                .eq(OutboundLabelScan::getSite,outboundLabelScan.getSite())
-                .eq(OutboundLabelScan::getDelNotifyNo,outboundLabelScan.getDelNotifyNo())
-                .eq(OutboundLabelScan::getDelNotifyItemNo,outboundLabelScan.getDelNotifyItemNo())
-                .list();
+        return  baseMapper.queryOutboundLabelScanList(outboundLabelScan);
+//        return lambdaQuery()
+//                .eq(OutboundLabelScan::getSite,outboundLabelScan.getSite())
+//                .eq(OutboundLabelScan::getDelNotifyNo,outboundLabelScan.getDelNotifyNo())
+//                .eq(OutboundLabelScan::getDelNotifyItemNo,outboundLabelScan.getDelNotifyItemNo())
+//                .list();
     }
 
     @Override
diff --git a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml
index 093a44e..fe3d509 100644
--- a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml
+++ b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml
@@ -54,4 +54,30 @@
     <select id="getUserName" resultType="java.lang.String">
         select dbo.Get_UserName(#{userId})
     </select>
+
+    <select id="queryOutboundLabelScanList" resultType="com.heai.modules.production.entity.OutboundLabelScan">
+        select olc.site,
+               del_notify_no,
+               del_notify_item_no,
+               scan_item_no,
+               scan_qty,
+               scan_type,
+               create_by,
+               create_data,
+               olc.seq_no,
+               plr.item_no as print_id
+        from outbound_label_scan olc
+        left join print_label_record plr on olc.print_id = plr.id
+        <where>
+            <if test="site != null and site != ''">
+                and olc.site = #{site}
+            </if>
+            <if test="delNotifyNo != null and delNotifyNo != ''">
+                and olc.del_notify_no = #{delNotifyNo}
+            </if>
+            <if test="delNotifyItemNo != null and delNotifyItemNo != ''">
+                and olc.del_notify_item_no = #{delNotifyItemNo}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file