From eac982b6ea74337c4053cccafb0497c2d5332508 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 10 Sep 2025 09:44:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84=E7=90=86=20-=20?= =?UTF-8?q?=E5=B7=B2=E5=BC=80=E7=A5=A8=20T7080300415602=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8E=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../resources/mapper/EmisSettleInvoiceRecordMapper.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index b321c1ea7..a76d6bc7b 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -151,12 +151,8 @@ and EXISTS( - select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3,emis_settle_sub_bill x4 - where x2.del_flag = '0' and x3.del_flag = '0' and x4.del_flag='0' - and a.apply_seq_no=x3.apply_seq_no - and x2.settle_bill_no=x3.settle_bill_no - and x4.settle_bill_no=x2.settle_bill_no - and FIND_IN_SET(x4.`bill_code`,#{params.billCode}) + select 1 from emis_settle_invoice_rel rel + where rel.del_flag = '0' and rel.bill_no=#{params.billCode} ) From 360325dbb6f5ba447e66e4526aa4858588b99736 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 10 Sep 2025 09:49:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84=E7=90=86=20-=20?= =?UTF-8?q?=E5=B7=B2=E5=BC=80=E7=A5=A8=20T7080300415602=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8E=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index a76d6bc7b..df489bbbf 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -153,6 +153,7 @@ and EXISTS( select 1 from emis_settle_invoice_rel rel where rel.del_flag = '0' and rel.bill_no=#{params.billCode} + and rel.apply_seq_no = a.apply_seq_no ) From a2db7b6e9d17bed99428583a030b1d9bd2631fd6 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 10 Sep 2025 10:03:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=20-=20=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=9D=83=E9=87=8D=20-=20=E6=96=B0=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E6=98=AF=E5=90=A6=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=20=E4=B8=A4=E4=B8=AA=E7=8A=B6=E6=80=81=20=E5=B7=B2?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=20=E6=9C=AA=E8=BF=87=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E6=9F=A5=E7=9C=8B=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java | 8 ++++++-- .../main/resources/mapper/EmisSpecialCalcWeightMapper.xml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java index 82f1ce200..ef330b639 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisSpecialCalcWeight.java * @author linfso * @date 2024-01-10 06:50:43 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

特殊取重 实体类

*/ @@ -69,4 +69,8 @@ public class EmisSpecialCalcWeight extends BaseEntity private String countryName; + // ------- 过期状态查询字段 + /* 过期状态 0-全部 1-已过期 2-未过期 */ + private Integer expireStatus; + } diff --git a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml index e59b6c59e..cbfe67a33 100644 --- a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml @@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_time = #{updateTime} and create_site = #{createSite} and update_site = #{updateSite} + and end_date now() + and end_date =]]> now() order by create_time desc From c4b47c9ce9bad45ba68069118ae3c8d64501e036 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 10 Sep 2025 11:49:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E8=BD=AC=E4=BB=B6=E7=AE=A1=E7=90=86=20-=20=E5=BF=AB=E9=80=9210?= =?UTF-8?q?0=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5=20-=20=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../resources/mapper/EmisTmsTransferTraceMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml index 94c56f814..d34d7e6f8 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.bill_code = #{billCode} order by create_time desc limit 1 - + insert into emis_tms_transfer_trace @@ -169,4 +169,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file +