diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java index c131747f..b42496dd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java @@ -260,12 +260,6 @@ public class DeliverVO { @Excel(name = "二次发货") private String secondDeliverVal; - /** - * 系统类型(0=会员系统,1=海圣优选) - */ - @Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选") - private Integer systemType; - /** * 打印时间 */ diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml index e4da8e1b..1f05181d 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml @@ -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 - - and so.SYSTEM_TYPE = #{param.systemType} - and sd.pk_id in