From 90717b4ec8b5e101122919f1ca0493e1d0abb99d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 30 Jun 2024 15:28:28 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 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 8db1bfde8..c40d95bcf 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
@@ -1254,21 +1254,29 @@ public class EmisBaseService {
          order.put("agingFlag", agingFlag);
 
          order.put("kdgs", "TANEX");
-         order.put("pdfInfo", waybill.getThirdCode());
 
-         String packageWJC="";
-         String package3dm="";
+         // 获取起始网点
+         EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
 
-         String pdfInfo = waybill.getThirdCode();
-         if(!StringUtils.isEmpty(pdfInfo)) {
-             pdfInfo = pdfInfo.replace("][", "||");
-             String[] striparr = pdfInfo.split("\\|\\|");
-             if(striparr.length == 2) {
-                 packageWJC = striparr[1].replace("]", "");
-                 package3dm = striparr[0].replace("[", "");
-             }
+         // 计算三段码 目的网点2字码+目的地名称
+         String destSite2Code = "";
+         EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
+         if(destSite!=null){
+             destSite2Code=destSite.getSizeCode2();
          }
 
+         // 目的地名称
+         EmisDestination destination=getDestinationByCode(waybill.getDestinationCode());
+         String destName="";
+         if(destination!=null){
+             destName=destination.getDestName();
+         }
+
+         String packageWJC=sendSite.getSiteName()+'-'+destName;
+         String package3dm=destSite2Code;
+         String pdfInfo="["+packageWJC+"]["+package3dm+"]";
+         order.put("pdfInfo", pdfInfo);
+
          order.put("packageWJC", packageWJC);
          order.put("package3dm", package3dm);
 
@@ -1334,11 +1342,10 @@ public class EmisBaseService {
          extData.put("k6",waybill.getThirdCode());
 
          extData.put("k7",emisTransProduct.getProdNameEn());
-         EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
+
          extData.put("k8",sendSite.getSiteNameEn());
          extData.put("k10",waybill.getSendSiteName());
 
-         EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
          extData.put("k9",destSite.getSiteNameEn());
          extData.put("k11",destSite.getSiteName());
 
@@ -1424,7 +1431,11 @@ public class EmisBaseService {
          String packTypeEn="";
          if(!StringUtils.isEmpty(waybill.getPackType())){
              packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType());
-             packTypeEn= TransUtils.langTrans(packType,"zh-cn","en");
+             try {
+                 packTypeEn= TransUtils.langTrans(packType,"zh-cn","en");
+             } catch (Exception e) {
+                 e.printStackTrace();
+             }
          }
          order.put("packType",packType);
          order.put("packTypeEn",packTypeEn);