From bd82a98c7eea78159edaf050ad8837e0afcd642e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 9 Jun 2024 17:45:30 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisWaybillController.java |  5 ++++-
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 3d4b4a432..b4ba5b253 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -364,7 +364,10 @@ public class EmisWaybillController extends EmisBaseController
             "sendProvince","sendProvinceName",
             "sendCity","sendCityName",
             "transLineType","transLineName",
-            "productType","productName"
+            "productType","productName",
+            "sendSiteName","destinationName",
+            "dispatchUnderlingSiteName"
+
 
     },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
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 0c22adf2e..cf320d007 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
@@ -623,11 +623,14 @@ public class EmisBaseService {
          // 派送方式
          order.put("dispatchType", dispatchType);
 
+         String agingFlag="";
          EmisTransProduct emisTransProduct=getTransProductByCode(waybill.getProductType());
          if(emisTransProduct!=null) {
-             order.put("agingFlag", emisTransProduct.getAgingFlag());
+             agingFlag=emisTransProduct.getAgingFlag();
          }
 
+         order.put("agingFlag", agingFlag);
+
          order.put("kdgs", "TANEX");
          order.put("pdfInfo", waybill.getThirdCode());
 
@@ -789,11 +792,12 @@ public class EmisBaseService {
          order.put("billWeight", billWeight);
          order.put("totalVolume", totalVolume);
 
+         Integer subSeqNum=1;
          if(isSubBill) {
              // 子单的序号
-             Integer subSeqNum=Integer.valueOf(subBillSuffix);
-             order.put("subSeqNum", subSeqNum);
+             subSeqNum=Integer.valueOf(subBillSuffix);
          }
+         order.put("subSeqNum", subSeqNum);
 
          String packType="";
          if(!StringUtils.isEmpty(waybill.getPackType())){