feat(Deliver-Sale): 发货清单立即发货列表移除系统类型字段
This commit is contained in:
parent
f20d0017e3
commit
92b6bef505
|
@ -260,12 +260,6 @@ public class DeliverVO {
|
|||
@Excel(name = "二次发货")
|
||||
private String secondDeliverVal;
|
||||
|
||||
/**
|
||||
* 系统类型(0=会员系统,1=海圣优选)
|
||||
*/
|
||||
@Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选")
|
||||
private Integer systemType;
|
||||
|
||||
/**
|
||||
* 打印时间
|
||||
*/
|
||||
|
|
|
@ -246,8 +246,7 @@
|
|||
nvl2(so.pk_original_order, 0, 1) second_deliver,
|
||||
bs.name storehouseName,
|
||||
bu.name unit_name,
|
||||
bpe.is_bar_code,
|
||||
so.SYSTEM_TYPE
|
||||
bpe.is_bar_code
|
||||
from SA_DELIVER sd
|
||||
left join SA_DELIVER_ITEMS sdi
|
||||
on sdi.pk_deliver = sd.pk_id
|
||||
|
@ -272,9 +271,6 @@
|
|||
where sd.del_flag = 0
|
||||
and sd.pk_country = #{pkCountry}
|
||||
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">
|
||||
and sd.pk_id in
|
||||
<foreach collection="param.pkIdList" item="item" open="(" close=")" separator=",">
|
||||
|
|
Loading…
Reference in New Issue