From 16bc0d6a3ad25ec7d4693f375cc75a9b21d139fd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 1 Jan 2025 15:33:32 +0800
Subject: [PATCH] md

---
 .../mapper/EmisWarehouseInMapper.xml          | 21 ++++++++++++++++++-
 .../resources/mapper/EmisWaybillMapper.xml    |  1 -
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 3b993ff21..134af30bd 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -193,7 +193,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and ewb.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
                 </if>
 
-
                 <if test="params.salesmen != null and params.salesmen != ''">
                     and ewb.salesmen like concat('%', #{params.salesmen}, '%')
                 </if>
@@ -215,6 +214,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </if>
             )
 
+            <if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == '1'">
+                and EXISTS (
+                    select 1 from emis_warehouse_in_batch ewib
+                    where
+                        ewib.del_flag='0'
+                        and a.in_no=ewib.in_no
+                        and ewib.pic_url is not null
+                )
+            </if>
+
+            <if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == '0'">
+                and EXISTS (
+                select 1 from emis_warehouse_in_batch ewib
+                where
+                    ewib.del_flag='0'
+                    and a.in_no=ewib.in_no
+                    and ewib.pic_url is null
+                )
+            </if>
+
 
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 667b9a960..ba17e1552 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -208,7 +208,6 @@
 
         <result property="problemTypeName"    column="problem_type_name"    />
 
-
         <result property="billPicSendRmk"    column="bill_pic_send_rmk"    />
         <result property="billPicDispatchRmk"    column="bill_pic_dispatch_rmk"    />
         <result property="billPicGoodsRmk"    column="goods_pics"    />