From 1c461875329ee89c06f2601e3cbdb375dba6bb15 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 3 Dec 2025 18:12:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?demand:=20=20=20=E4=B8=9A=E5=8A=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E8=B4=A6=E5=8D=95=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/web/emis/EmisSettleSubBillController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 74e46fb23..1f8e915e7 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 @@ -469,7 +469,7 @@ public class EmisSettleSubBillController extends EmisBaseController */ EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo()); if (waybill.getRealFee() == null) { - return AjaxResult.success("确认成功"); + return AjaxResult.error("报价未配置，请联系it解决"); } if( !"2".equals(waybill.getPaymentType()) From bb3550638d9fb3564de1eaf7bc64efb4f2dce330 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 4 Dec 2025 09:45:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?demand:=20=20=20tms-=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E2=80=9C=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E2=80=9D=E3=80=81=E2=80=9C=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E7=8A=B6=E6=80=81=E2=80=9D=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0=E2=80=9C=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=81=E9=97=AE=E9=A2=98=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E9=97=AE=E9=A2=98=E4=BB=B6=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/domain/EmisTmsSiteBatchMiss.java | 7 ++- .../mapper/EmisTmsSiteBatchMissMapper.xml | 63 ++++++++++++++++++- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java index f3154f785..15baf7720 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java @@ -52,7 +52,7 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { /* 寄件日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date sendDate; - /* 签收状态 */ + /* 签收状态 1已签收 0未签收*/ private String blSign; /* 签收时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -126,8 +126,11 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { /* 是否问题件 1-是 0-否 */ private String blIsQuestion; - private String virtualRemark; + /* 问题件类型 */ private Integer problemType; + /* 问题件原因 */ + private String problemCause; + private String virtualRemark; /* 目的地网点代码 */ private String dispatchUnderlingSiteCode; // 目的地网点名称 diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index abfd63b4f..b5fddd127 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, w.payee, w.salesmen, u.emp_name as registerManName, @@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, w.payee, w.salesmen, u.emp_name as registerManName, @@ -192,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, + w.problem_type, w.problem_cause, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, @@ -270,6 +272,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + @@ -380,6 +396,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + order by m.bill_code desc @@ -402,6 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, + w.problem_type, w.problem_cause, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, @@ -480,6 +511,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + @@ -593,6 +638,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + order by m.bill_code desc From a7017a0aa6ff48e275921a18684e6a1211a71f5c Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 4 Dec 2025 10:34:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?demand:=20=20=20TMS-=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7-=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=BF=99=E4=B8=AA=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=94=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=AE=A9=E4=BB=96=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 1 + .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 17357f3fc..ace4855cd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -416,6 +416,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]" ); + emisWaybillSave.getParams().put("isAuditCenter", "1"); if(isDZZS) { emisWaybillService.reUpdateWayBill(emisWaybillOld, emisWaybillSave, false, true); }else{ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 8827a3f1d..7910cbe62 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2664,9 +2664,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(emisMonthCustomerUser==null){ throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户不存在"); } - // 判断客户是否停用 - if(!"1".equals(emisMonthCustomerUser.getStatus())){ + if(!"1".equals(emisMonthCustomerUser.getStatus()) && !"1".equals(emisWaybillSave.getParams().get("isAuditCenter"))){ throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户已停用"); } From 18d9502e98372086989a572db826d4bcc11dcdff Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 4 Dec 2025 10:57:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?demand:=20=20=20TMS-=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7-=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=BF=99=E4=B8=AA=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=94=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=AE=A9=E4=BB=96=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/domain/EmisTmsSiteBatchMiss.java | 2 ++ .../resources/mapper/EmisTmsSiteBatchMissMapper.xml | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java index 15baf7720..44ff82ed6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java @@ -128,6 +128,8 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { private String blIsQuestion; /* 问题件类型 */ private Integer problemType; + /* 问题件类型名称 */ + private String problemTypeName; /* 问题件原因 */ private String problemCause; private String virtualRemark; diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index b5fddd127..516588417 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -66,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,pt.type_name as problem_type_name,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, w.payee, w.salesmen, u.emp_name as registerManName, @@ -90,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0' left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0' left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' + left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0' @@ -102,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,pt.type_name as problem_type_name,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, w.payee, w.salesmen, u.emp_name as registerManName, @@ -126,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0' left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0' left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' + left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0' @@ -193,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.problem_type, w.problem_cause, + w.problem_type, pt.type_name as problem_type_name, w.problem_cause, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, @@ -218,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0 left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0 left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' + left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0' b.site_batch_status = '1' @@ -432,7 +436,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.problem_type, w.problem_cause, + w.problem_type, pt.type_name as problem_type_name, w.problem_cause, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, @@ -457,6 +461,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0 left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0 left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' + left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0' b.site_batch_status = '1' From 26b7752a3afbfe858dae0b4a50c60156a641c98d Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 4 Dec 2025 11:21:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?demand:=20=20=20TMS-=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7-=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=BF=99=E4=B8=AA=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=94=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=AE=A9=E4=BB=96=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/web/emis/EmisSettleSubBillController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f8e915e7..74e46fb23 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 @@ -469,7 +469,7 @@ public class EmisSettleSubBillController extends EmisBaseController */ EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo()); if (waybill.getRealFee() == null) { - return AjaxResult.error("报价未配置，请联系it解决"); + return AjaxResult.success("确认成功"); } if( !"2".equals(waybill.getPaymentType())