1.修复查询省市区的bug

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);
 }

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);

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);
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java

@@ -14,4 +14,6 @@ public interface WayBillMapper extends BaseMapper<WayBillEntity> {
     List<Integer> findAdvanceIdsByWaybillNo(@Param("waybillNo") String waybillNo);
 
 	WayBillEntity getByWayBillByOrderCode(@Param("orderCode") String orderCode);
+
+    String findAreaCodeByArriveSiteId(@Param("arriveSiteId") Integer arriveSiteId);
 }

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
     </select>
 
+    <select id="findAreaCodeByArriveSiteId" resultType="String">
+        select LEFT(area_code,6)
+        from ht_city
+        where id = #{arriveSiteId}
+    </select>
+
 </mapper>

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java

@@ -20,4 +20,6 @@ public interface IWayBillService {
     List<Integer> findAdvanceIdsByWaybillNo(String waybillNo);
 
 	WayBillEntity getByWayBillByOrderCode(String orderCode);
+
+    String findAreaCodeByArriveSiteId(Integer arriveSiteId);
 }

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);
+	}
 }

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);