From 294e919faf470b92150e4233f36298824ca37a43 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 3 Nov 2022 17:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=89=93=E5=8D=B0=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=202022=E5=B9=B411=E6=9C=883=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/print/OutboxPrintMapper.xml        | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/print/OutboxPrintMapper.xml b/src/main/resources/mapper/print/OutboxPrintMapper.xml
index 49436d1..fd3cfe7 100644
--- a/src/main/resources/mapper/print/OutboxPrintMapper.xml
+++ b/src/main/resources/mapper/print/OutboxPrintMapper.xml
@@ -4,34 +4,32 @@
 <mapper namespace="com.gaotao.modules.print.dao.OutBoxPrintMapper">
 
     <select id="getBoxLabelSO" resultType="com.gaotao.modules.print.entity.vo.OutBoxPrintVo">
-        Select 客户编码 as customer_id,数量 as sum_qty,每箱数量 as box_qty from view_Print_Box_Label_SO
-        where 订单号=#{orderNo}
+        Select 客户编码 as customer_id, 数量 as sum_qty, 每箱数量 as box_qty
+        from view_Print_Box_Label_SO
+        where 订单号 = #{orderNo}
     </select>
     <select id="getBoxLabelSOByRollNo" resultType="com.gaotao.modules.print.entity.vo.OutBoxPrintVo">
-        Select 客户编码 as customer_id,数量 as sum_qty,每箱数量 as box_qty from view_Print_Box_Label
-        where 卷号=#{rollNo}
+        Select 客户编码 as customer_id, 数量 as sum_qty, 每箱数量 as box_qty
+        from view_Print_Box_Label
+        where 卷号 = #{rollNo}
     </select>
     <select id="getReportFileByCustomer" resultType="java.util.Map">
-        exec dbo.Get_Report_FileList #{customerId},#{reportFamily}
+        exec dbo.Get_Report_FileList #{customerId}, #{reportFamily}
     </select>
     <select id="getReportSubFileList" resultType="java.util.Map">
-        exec Get_Report_SubFileList  #{reportId},#{customerId},#{reportFamily},#{defaultFlag}
+        exec Get_Report_SubFileList #{reportId}, #{customerId}, #{reportFamily}, #{defaultFlag}
     </select>
 
     <select id="getBoxLabelPrintData" resultType="java.util.Map">
-        Select  top 1 *  from view_Print_Box_Label
-        <where>
-            <if test="orderNo != '' and orderNo != null">
-                生产单号=#{orderNo}
-            </if>
-            <if test="rollNo != '' and rollNo != null">
-               and 卷号=#{rollNo}
-            </if>
-        </where>
+        Select top 1 *
+        from view_Print_Box_Label_SO
+        where 生产单号 = #{orderNo}
+
     </select>
     <select id="getBoxLabelPrintRollData" resultType="java.util.Map">
-        Select  top 1 *  from dbo.view_Print_Box_Label_SO
-        where 卷号=#{rollNo}
+        Select top 1 *
+        from dbo.view_Print_Box_Label
+        where 卷号 = #{rollNo}
     </select>