From 636d911ab190fbbd2ec9e22a29c6e2d8586b6c3a Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 21 May 2025 15:07:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(Deliver-Sale):=20=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AB=8B=E5=8D=B3=E5=8F=91=E8=B4=A7=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 --- .../src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java | 6 ------ .../main/resources/mapper/sale/deliver/SaDeliverMapper.xml | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) 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