Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -105,7 +105,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 				IPage<BasicdataWarehouseVO> basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse);
 				return basicdataExpireWarehouseVOS;
 			default:
-				log.error("未知的pageType>>>>>>>>>>>>>>>");
+				log.error("未知的pageType>>>>>>>>>>>>>>> {}",pageType);
 		}
 		//查询全部列表
 		//查询已到期列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -625,20 +625,10 @@
                               and ldrs.stock_article_status in (1, 3)
                         )                  orderNum,
                         (
-                            select COUNT(ldrp.id)
-                            from logpm_distribution_reservation dr
-                                     LEFT JOIN logpm_distribution_reservation_package ldrp
-                                               on ldrp.reservation_id = dr.id
-                            where dr.id = #{param.reservationId}
-                              and ldrp.packet_bar_status in (1, 3)
+        ldr.reservation_num + ldr.reservation_stock_list_num
                         )                  planNum,
                         (
-                            select sum(ldrs.reservation_num)
-                            from logpm_distribution_reservation dr
-                                     LEFT JOIN logpm_distribution_reservation_stocklist ldrs
-                                               on ldrs.reservation_id = dr.id
-                            where dr.id = #{param.reservationId}
-                              and ldrs.stock_list_status in (1, 3)
+        ldr.reservation_stock_list_num
                         ) inventoryNub
         from logpm_distribution_reservation ldr
                  LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND  ldsi.stock_status != 4

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -386,9 +386,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				}
 
 			});
-			if (b.get()) {
-				vo.setPlanNum(nu.get());
+			vo.setPlanNum(0);
+			if (!list1.isEmpty()) {
+				List<DistributionReservationEntity> distributionReservationEntities = distributionReservationService.listByIds(list1.stream().map(DistributionStockupInfoEntity::getReservationId).collect(Collectors.toList()));
+				if (!distributionReservationEntities.isEmpty()) {
+					int packagePlanNum = distributionReservationEntities.stream().mapToInt(DistributionReservationEntity::getReservationNum).sum();
+					int inventoryPlanNum = distributionReservationEntities.stream().mapToInt(DistributionReservationEntity::getReservationStockListNum).sum();
+					vo.setPlanNum(packagePlanNum+inventoryPlanNum);
+					vo.setInventoryNub(inventoryPlanNum);
+				}
 			}
+//			if (b.get()) {
+//				vo.setPlanNum(nu.get());
+//			}
 			//查询以扫数量
 			List<DistributionStockEntity> list = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda().eq(DistributionStockEntity::getStockupId, vo.getId()));
 			if (list.isEmpty()) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -59,7 +59,6 @@ public class InComingServiceImpl implements IInComingService {
 	private final IWarehouseTrayTypeClient warehouseTrayTypeClient;
 	private final IBasicdataWarehouseClient warehouseClient;
 	private final IPackageTrackLogAsyncService packageTrackLogAsyncService;
-	//	private final DynamicDataSourceProvider dynamicDataSourceProvider;
 	private final RabbitTemplate rabbitTemplate;
 	private final FactoryDataMessageSender factoryDataMessageSender;
 	private final ISysClient sysClient;