angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Deliver-Sale): 发货清单立即发货列表移除系统类型字段

This commit is contained in:
woody 2025-05-21 15:07:34 +08:00 committed by cabbage
parent 3a41c7e5b9
commit 636d911ab1
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java
View File

@ -260,12 +260,6 @@ public class DeliverVO {
@Excel(name = "二次发货") @Excel(name = "二次发货")
private String secondDeliverVal; private String secondDeliverVal;
/**
* 系统类型（0=会员系统，1=海圣优选）
*/
@Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选")
private Integer systemType;
/** /**
* 打印时间 * 打印时间
*/ */

6
bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml
View File

@ -246,8 +246,7 @@
nvl2(so.pk_original_order, 0, 1) second_deliver, nvl2(so.pk_original_order, 0, 1) second_deliver,
bs.name storehouseName, bs.name storehouseName,
bu.name unit_name, bu.name unit_name,
bpe.is_bar_code, bpe.is_bar_code
so.SYSTEM_TYPE
from SA_DELIVER sd from SA_DELIVER sd
left join SA_DELIVER_ITEMS sdi left join SA_DELIVER_ITEMS sdi
on sdi.pk_deliver = sd.pk_id on sdi.pk_deliver = sd.pk_id
@ -272,9 +271,6 @@
where sd.del_flag = 0 where sd.del_flag = 0
and sd.pk_country = #{pkCountry} and sd.pk_country = #{pkCountry}
and sdi.del_flag = 0 and sdi.del_flag = 0
<if test="param.systemType != null">
and so.SYSTEM_TYPE = #{param.systemType}
</if>
<if test="param.pkIdList != null and param.pkIdList.size > 0"> <if test="param.pkIdList != null and param.pkIdList.size > 0">
and sd.pk_id in and sd.pk_id in
<foreach collection="param.pkIdList" item="item" open="(" close=")" separator=","> <foreach collection="param.pkIdList" item="item" open="(" close=")" separator=",">