diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java index fc8f70a3..43c3d37d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java @@ -251,13 +251,7 @@ public class DeliverUnhandledVO { */ @Excel(name = "备注") private String remark; - - /** - * 系统类型(0=会员系统,1=海圣优选) - */ - @Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选") - private Integer systemType; - + /** * 创建时间 */ diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index 34cec49c..9a5c2f33 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -80,8 +80,7 @@ null end original_order_code, bs.name storehouse_name, - bu.name unit_name, - so.SYSTEM_TYPE + bu.name unit_name from SA_ORDER so left join sa_order_items soi on soi.pk_order = so.pk_id @@ -100,9 +99,6 @@ left join bd_storehouse bs on bs.pk_id = so.pk_storehouse - - and so.SYSTEM_TYPE = #{param.systemType} - and bs.name like #{param.fhck} || '%'