diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java index e204fba84..8cba15c38 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java @@ -51,4 +51,7 @@ public interface IWayBillClient { @GetMapping(API_PREFIX + "/getByWayBillByOrderCode") WayBillEntity getByWayBillByOrderCode(@RequestParam String orderCode); + + @GetMapping(API_PREFIX + "/findAreaCodeByArriveSiteId") + String findAreaCodeByArriveSiteId(@RequestParam Integer arriveSiteId); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 74da067c5..a6848afa2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -948,8 +948,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); - String arriveSite = wayBillEntity.getArriveSite(); - String code = regionFeign.getCode(arriveSite); +// String arriveSite = wayBillEntity.getArriveSite(); + Integer arriveSiteId = wayBillEntity.getArriveSiteId(); + String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); +// String code = regionFeign.getCode(arriveSite); warehouseWaybill.setDestinationCode(code); warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); warehouseWaybill.setGoodsName(packname); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java index 448b7e31f..3e5708fee 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java @@ -66,4 +66,9 @@ public class WayBillClient implements IWayBillClient { public WayBillEntity getByWayBillByOrderCode(String orderCode) { return wayBillService.getByWayBillByOrderCode(orderCode); } + + @Override + public String findAreaCodeByArriveSiteId(Integer arriveSiteId) { + return wayBillService.findAreaCodeByArriveSiteId(arriveSiteId); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java index 02cbdc077..90bc21ce7 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java @@ -14,4 +14,6 @@ public interface WayBillMapper extends BaseMapper { List findAdvanceIdsByWaybillNo(@Param("waybillNo") String waybillNo); WayBillEntity getByWayBillByOrderCode(@Param("orderCode") String orderCode); + + String findAreaCodeByArriveSiteId(@Param("arriveSiteId") Integer arriveSiteId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml index eb71cd18e..f05948ff3 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml @@ -27,4 +27,10 @@ select ht_way_bill.* FROM ht_way_bill LEFT JOIN ht_advance on ht_advance.waybi limit 1 + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java index 1f72401ca..4d74653e4 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java @@ -20,4 +20,6 @@ public interface IWayBillService { List findAdvanceIdsByWaybillNo(String waybillNo); WayBillEntity getByWayBillByOrderCode(String orderCode); + + String findAreaCodeByArriveSiteId(Integer arriveSiteId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java index b32dd22f1..a95cbdd6c 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java @@ -47,4 +47,9 @@ public class WayBillServiceImpl implements IWayBillService { public WayBillEntity getByWayBillByOrderCode(String orderCode) { return wayBillMapper.getByWayBillByOrderCode(orderCode); } + + @Override + public String findAreaCodeByArriveSiteId(Integer arriveSiteId) { + return wayBillMapper.findAreaCodeByArriveSiteId(arriveSiteId); + } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index d2787a2c7..8f51be4d0 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1070,8 +1070,10 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); - String arriveSite = wayBillEntity.getArriveSite(); - String code = regionFeign.getCode(arriveSite); +// String arriveSite = wayBillEntity.getArriveSite(); + Integer arriveSiteId = wayBillEntity.getArriveSiteId(); + String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); +// String code = regionFeign.getCode(arriveSite); warehouseWaybill.setDestinationCode(code); warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); warehouseWaybill.setGoodsName(packname);