Merge branch 'dev' into pre-production

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java

@@ -76,6 +76,10 @@ public interface IAdvanceDetailClient {
 	@GetMapping(API_PREFIX + "/getByUnitNo")
 	DistributionParcelListEntityVO getByUnitNo(@RequestParam String unitNo);
 
+
+	@GetMapping(API_PREFIX + "/getByUnitNoByPyl")
+	DistributionParcelListEntityVO getByUnitNoByPyl(@RequestParam String unitNo);
+
 	@GetMapping(API_PREFIX + "/getAllNumByOrderNo")
 	Integer getAllNumByOrderNo(@RequestParam String orderSelfNum);
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -576,7 +576,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 	/**
 	 * 保存包件信息
-	 *
+	 *
 	 * @param unitNo 包条码
 	 * @param distributionStockArticleEntity 订单对象
 	 * @param basicdataWarehouseEntity 仓库对象
@@ -585,6 +585,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 		DistributionParcelListEntityVO vo;
 		// 判断当前查询包件不是否为皮阿落
+		// todo 这里不合理 需要优化
 		if("皮阿诺".equals(distributionStockArticleEntity.getBrand())){
 			vo = advanceDetailClient.getByUnitNoByPyl(unitNo);
 		}else{