From 3a41c7e5b953effb7fb963d76d9333272c39b813 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 21 May 2025 15:01:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(SaOrderItemMapper-Sale):=20=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=B8=85=E5=8D=95=E6=9C=AA=E5=90=88=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=A7=BB=E9=99=A4=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java | 8 +------- .../resources/mapper/sale/order/SaOrderItemsMapper.xml | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) 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} || '%'