Просмотр исходного кода

采购订单生成物流托运消息列表bugfix

lengfaqiang 2 лет назад
Родитель
Сommit
6681d4c8c8

+ 9 - 3
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -247,16 +247,22 @@ public class LogisticsConsignmentService {
             EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
             checkUnit.setUnitType(1);
             checkUnit.setFirmName(bo.getCheckCompany());
-            checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+            checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
             checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
             checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
 
             carriageUnit.setUnitType(2);
             carriageUnit.setFirmName(bo.getConsignCompany());
-            carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+            carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
             carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
             carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
-            type = "1";
+            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
+            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
+            type = "2";
         } else if ("2".equals(orderType)) {
             EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
             EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));