From be7f0b906470e751f25e18848f645239f06f10e9 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 11 Oct 2025 15:53:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=20=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=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=20-=E5=8F=91=E9=80=81=E8=88=AA=E4=BF=A1=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E5=A4=B1=E8=B4=A5=E5=A2=9E=E5=8A=A0=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../EmisSettleInvoiceChRecordServiceImpl.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index c25843ec1..4553d667f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -526,12 +526,34 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem } - } - else{ - EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord(); + } else { + // 安全获取failDetails数组 - 根据实际JSON结构调整路径 + JSONArray jArrFailList = null; + String errorMessage = jRst != null ? jRst.getString("message") : "未知错误"; + + if (jRst != null) { + JSONObject data = jRst.getJSONObject("data"); + if (data != null) { + jArrFailList = data.getJSONArray("failDetails"); + } + } + + // 构建错误描述 + String statusDesc = errorMessage; + if (jArrFailList != null && jArrFailList.size() > 0) { + JSONObject item0 = jArrFailList.getJSONObject(0); + if (item0 != null) { + String failReason = item0.getString("failReason"); + if (failReason != null) { + statusDesc = errorMessage + " -- " + failReason; + } + } + } + + EmisSettleInvoiceChRecord newRecord = new EmisSettleInvoiceChRecord(); newRecord.setId(old.getId()); newRecord.setOpenChStatus("-1"); - newRecord.setOpenChStatusDesc(jRst.getString("message")); + newRecord.setOpenChStatusDesc(statusDesc); emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord); } return 1; From 7ea4d0c749cdfb093e0faf62be5b62f2148da8b1 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 11 Oct 2025 16:05:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?demand:=20=20=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=20-=20=E5=BF=AB=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../src/main/resources/mapper/EmisWriteoffApplyMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 2cecef438..8e85bbcd0 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -493,8 +493,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.create_time as w_create_time, w.update_by as w_update_by, w.update_time as w_update_time, w.remark as w_remark, -- 新增运单字段：寄件日期、产品类型、件数、结算重量 w.send_date as w_send_date, w.product_type as w_product_type, w.parcel_qty as w_parcel_qty, w.settlement_weight as w_settlement_weight, - -- 快件类型（寄件网点-目的网点） - CONCAT(COALESCE(send_site.size_code2, ''), '-', COALESCE(dest_site.size_code2, '')) as express_type,tp.prod_name as w_product_type_name, + -- 快件类型（寄件网点名称-目的网点名称） + CONCAT(COALESCE(send_site.site_name, ''), '-', COALESCE(dest_site.site_name, '')) as express_type,tp.prod_name as w_product_type_name, -- 结算账单信息 sb.id as sb_id, sb.settle_bill_no as sb_settle_bill_no, sb.settle_bill_name as sb_settle_bill_name, From 0fd4e2f54faa48b94a8daa8f34365d4501accb39 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 11 Oct 2025 16:07:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?demand:=20=20=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=20-=20=E5=BF=AB=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../src/main/resources/mapper/EmisWriteoffApplyMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 8e85bbcd0..230241246 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -494,7 +494,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- 新增运单字段：寄件日期、产品类型、件数、结算重量 w.send_date as w_send_date, w.product_type as w_product_type, w.parcel_qty as w_parcel_qty, w.settlement_weight as w_settlement_weight, -- 快件类型（寄件网点名称-目的网点名称） - CONCAT(COALESCE(send_site.site_name, ''), '-', COALESCE(dest_site.site_name, '')) as express_type,tp.prod_name as w_product_type_name, + CONCAT(COALESCE(send_site.site_name, ''), '--', COALESCE(dest_site.site_name, '')) as express_type,tp.prod_name as w_product_type_name, -- 结算账单信息 sb.id as sb_id, sb.settle_bill_no as sb_settle_bill_no, sb.settle_bill_name as sb_settle_bill_name, @@ -522,9 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ssb.customer_name as ssb_customer_name, ssb.invoiced_money as ssb_invoiced_money, ssb.reced_money as ssb_reced_money, ssb.satisfy_money as ssb_satisfy_money, ssb.allowance_money as ssb_allowance_money, ssb.deduction_money as ssb_deduction_money, ssb.other_money as ssb_other_money, ssb.satisfy_reason as ssb_satisfy_reason, ssb.allowance_reason as ssb_allowance_reason, - ssb.deduction_reason as ssb_deduction_reason, ssb.other_reason as ssb_other_reason, + ssb.deduction_reason as ssb_deduction_reason, ssb.other_reason as ssb_other_reason, ssb.bl_confirm_center as ssb_bl_confirm_center, ssb.bl_confirm_site as ssb_bl_confirm_site, - ssb.create_by as ssb_create_by, ssb.create_time as ssb_create_time, ssb.update_by as ssb_update_by, + ssb.create_by as ssb_create_by, ssb.create_time as ssb_create_time, ssb.update_by as ssb_update_by, ssb.update_time as ssb_update_time from emis_waybill w left join emis_settle_sub_bill ssb on w.bill_code = ssb.bill_code and ssb.del_flag = '0'