From ec862a0667d5f5df453fb9e0faeb87114ef28ecc Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 28 May 2024 13:52:49 +0800 Subject: [PATCH] md --- .../erp/emis/service/EmisBaseService.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 3abac0ac1..c67ac815b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -452,13 +452,30 @@ public class EmisBaseService { order.put("sendPerson", waybill.getSendName()); order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate())); + // k1 - 收件国(中文) + // k2 - 线路名称(中文) + // k3 - 产品类型(中文) + // k4 - 时效描述 + // k5 - 网点二字码 + // k6 - 三段码 + // k7 - 产品类型(英文) + // k8 - 寄件网点(英文) + // k9 - 目的网点(英文) + JSONObject extData = new JSONObject(); extData.put("k1",waybill.getReceiveCountryName()); extData.put("k2",waybill.getTransLineTypeName()); extData.put("k3",waybill.getProductTypeName()); extData.put("k4",waybill.getTimeType()); - extData.put("k5","目的网点二字码"); - extData.put("k6","山东淄博-阿尔巴尼亚地拉那"); + extData.put("k5",packageWJC); + extData.put("k6",waybill.getThirdCode()); + + extData.put("k7",emisTransProduct.getProdNameEn()); + EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode()); + extData.put("k8",sendSite.getSiteNameEn()); + EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode()); + extData.put("k9",destSite.getSiteNameEn()); + order.put("extData",extData.toJSONString()); order.put("qrCodeText",extData.toJSONString());