From c2ec12b45ec3e0574b2078f45ad31c10601c65af Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 5 Jan 2026 09:25:32 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=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?=E4=B8=9A=E5=8A=A1=E5=87=BA=E8=B4=A6=E7=A1=AE=E8=AE=A4=20-=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=20=20=20=20TMS=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20-=20=E4=B8=9A=E5=8A=A1=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7/=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=20-=20=E6=8C=89=E8=BF=90=E5=8D=95=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E4=B8=8D=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../erp/web/emis/EmisSettleSubBillController.java | 10 ++++++++-- .../resources/mapper/EmisSettleInvoiceRecordMapper.xml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index 7647a166e..35aa397f0 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -145,7 +145,7 @@ public class EmisSettleSubBillController extends EmisBaseController { setPrivParams(emisSettleSubBill); - if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ + if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); String[] billCodeSortList = emisSettleSubBill.getBillCode().split(","); if(billCodeSortList.length>1){ @@ -440,6 +440,13 @@ public class EmisSettleSubBillController extends EmisBaseController return AjaxResult.error("账单不存在:"+old.getBillCode()); } + EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo()); + if(waybill==null){ + return AjaxResult.error("运单不存在:"+old.getBillCode()); + } + if ("6".equals(waybill.getPaymentType())) { + return AjaxResult.error(old.getBillCode() + "支付方式是其他,不允许确认账单，请修改正确的支付方式"); + } if(!"0086".equals(old.getWaybillDetail().getSendCountry()) && "0086".equals(old.getWaybillDetail().getReceiveCountry()) && ( "2".equals(old.getWaybillDetail().getPaymentType()) @@ -467,7 +474,6 @@ public class EmisSettleSubBillController extends EmisBaseController bug:1688 调整为现金保留自动确认,月结调整为不自动确认 */ - EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo()); if (waybill.getRealFee() == null) { continue; } diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index 22dccb541..4a9f35d46 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -191,7 +191,7 @@ and EXISTS( select 1 from emis_settle_invoice_rel rel - where rel.del_flag = '0' and rel.bill_no=#{params.billCode} + where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode}) and rel.apply_seq_no = a.apply_seq_no ) @@ -350,7 +350,7 @@ and EXISTS( select 1 from emis_settle_invoice_rel rel - where rel.del_flag = '0' and rel.bill_no=#{params.billCode} + where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode}) and rel.apply_seq_no = a.apply_seq_no )