From a7eab6ea5b602bfba1836f081776fe85b663a57f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 24 May 2024 15:15:09 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 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 f9d3a4dd2..a22524071 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
@@ -389,6 +389,19 @@ public class EmisBaseService {
          order.put("orderSn", waybill.getOrderSn());
          order.put("ydSn", billCode);
          order.put("logisticNo", billCode);
+
+         String mainBillCode=waybill.getBillCode();
+         String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
+         // 短号,运单号后6位
+         order.put("shortLogisticNo", shortLogisticNo);
+
+         String dispatchType="派送";
+         if("2".equals(waybill.getDispatchMethod())){
+             dispatchType="自提";
+         }
+         // 派送方式
+         order.put("dispatchType", dispatchType);
+
          order.put("kdgs", "TANEX");
          order.put("pdfInfo", waybill.getThirdCode());
 
@@ -409,6 +422,8 @@ public class EmisBaseService {
          order.put("mobile", waybill.getReceiveMobile());
          order.put("consignee", waybill.getReceiveName());
 
+
+
          String custName=waybill.getReceiveCompany();
          if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType())  || "5".equals(waybill.getPaymentType()) ) {
              EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo());
@@ -883,17 +898,21 @@ public class EmisBaseService {
 //         System.out.println(startDate);
 //         System.out.println(endDate);
 
-         String pdfInfo="[南京市场部-越南胡志明][越HCM]";
-         pdfInfo=pdfInfo.replace("][","||");
+//         String pdfInfo="[南京市场部-越南胡志明][越HCM]";
+//         pdfInfo=pdfInfo.replace("][","||");
+//
+//         String[] striparr = pdfInfo.split("\\|\\|");
+//
+//         System.out.println(striparr[1]);
+//         System.out.println(striparr[0]);
+//         String packageWJC = striparr[1].replace("]", "");
+//         String package3dm = striparr[0].replace("[", "");
+//         System.out.println(packageWJC);
+//         System.out.println(package3dm);
 
-         String[] striparr = pdfInfo.split("\\|\\|");
-
-         System.out.println(striparr[1]);
-         System.out.println(striparr[0]);
-         String packageWJC = striparr[1].replace("]", "");
-         String package3dm = striparr[0].replace("[", "");
-         System.out.println(packageWJC);
-         System.out.println(package3dm);
+         String mainBillCode="T7080300000379";
+         String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
+         System.out.println(shortLogisticNo);
 
 
      }