md

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsPackMapper.java

@@ -70,6 +70,14 @@ public interface EmisTmsPackMapper extends BaseMapper<EmisTmsPack>
     public int updateEmisTmsPackByPackNo(EmisTmsPack emisTmsPack);
 
 
+    /**
+     * 获取合包信息
+     * @param packNo
+     * @return
+     */
+    public EmisTmsPack selectEmisTmsPackByPackNo(String packNo);
+
+
 
     /**
      * 删除

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -155,6 +155,9 @@ public class EmisBaseService {
      @Autowired
      private EmisWarehouseInMapper emisWarehouseInMapper;
 
+     @Autowired
+     private EmisTmsPackMapper emisTmsPackMapper;
+
      @Autowired
      RedissonService redissonService;
 
@@ -585,12 +588,12 @@ public class EmisBaseService {
                  if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferExpress())) {
                      transferCompanyName = DictUtils.getDictLabel("emis_express_code", emisTmsTransferTrace.getTransferExpress());
                  }
-//                 content = "转三方快递 [" + transferCompanyName + ":" + emisTmsTransferTrace.getTransferBillCode() + "]";
-             }
-
                  if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferBillCode())){
                      transferBillCode=emisTmsTransferTrace.getTransferBillCode();
                  }
+             }
+
+
              content = "转三方快递 [" + transferCompanyName + ":" + transferBillCode + "]";
 
          }
@@ -922,9 +925,16 @@ public class EmisBaseService {
      }
 
 
+
      /**
       * 更新签收状态
-      * @param billCode
+      * @param mainBillCode
+      * @param signMan
+      * @param signManCode
+      * @param signSiteCode
+      * @param signDate
+      * @param billPicDispatchRmk
+      * @param dispatchOrSendManCode
       */
      public void updateSignStatus(String mainBillCode,String signMan,String signManCode,
                                   String signSiteCode,Date signDate,
@@ -961,9 +971,10 @@ public class EmisBaseService {
          emisWaybillMapper.updateDispatchStatus(waybill);
      }
 
+
      /**
       * 更新为未签收状态
-      * @param billCode
+      * @param mainBillCode
       */
      public void updateUnSignStatus(String mainBillCode) {
 
@@ -1107,6 +1118,18 @@ public class EmisBaseService {
              return null;
          }
 
+         Map<String, Object> order = new HashMap<>();
+
+         // 合包打印
+         if("THB".equals(tplCode)){
+             EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(billCode);
+             if(emisTmsPack==null){
+                 return null;
+             }
+             order.put("bagNo",emisTmsPack.getPackNo());
+             return order;
+         }
+
          boolean isSubBill=false;
          // 判断是否是子单
          String mainBillCode = "";
@@ -1143,7 +1166,7 @@ public class EmisBaseService {
 
          }
 
-         Map<String, Object> order = new HashMap<>();
+
          order.put("orderSn", waybill.getOrderSn());
          order.put("ydSn", billCode);
          order.put("logisticNo", billCode);