aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-01 15:33:32 +08:00
parent 9b462967e2
commit 16bc0d6a3a
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
View File

@ -193,7 +193,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and ewb.pick_start_date <![CDATA[ <= ]]> #{params.endPickStartDate} and ewb.pick_start_date <![CDATA[ <= ]]> #{params.endPickStartDate}
</if> </if>
<if test="params.salesmen != null and params.salesmen != ''"> <if test="params.salesmen != null and params.salesmen != ''">
and ewb.salesmen like concat('%', #{params.salesmen}, '%') and ewb.salesmen like concat('%', #{params.salesmen}, '%')
</if> </if>
@ -215,6 +214,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </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 != ''"> <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and create_time <![CDATA[ >= ]]> #{params.beginCreateTime} and create_time <![CDATA[ >= ]]> #{params.beginCreateTime}

1
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -208,7 +208,6 @@
<result property="problemTypeName" column="problem_type_name" /> <result property="problemTypeName" column="problem_type_name" />
<result property="billPicSendRmk" column="bill_pic_send_rmk" /> <result property="billPicSendRmk" column="bill_pic_send_rmk" />
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" /> <result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="billPicGoodsRmk" column="goods_pics" /> <result property="billPicGoodsRmk" column="goods_pics" />