Merge branch 'dev' into test

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

@@ -396,8 +396,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 		QueryWrapper<PanFactoryOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("order_no",orderNo);
-		PanFactoryOrder one = factoryOrderService.getOne(queryWrapper);
+		List<PanFactoryOrder> one = factoryOrderService.list(queryWrapper);
-		if(!Objects.isNull(one)){
+		if(!Objects.isNull(one)&& one.size() > 0){
 			//如果订单已存在就去验证订单下面的包件信息
 			List<PanPackageInfoDTO> order_attributes = factoryOrderDTO.getORDER_ATTRIBUTES();
 			QueryWrapper<PanPackageInfo> qw = new QueryWrapper<>();