1.入库逻辑优化

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java

@@ -25,7 +25,7 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
 
 	IPage<WarehouseWaybillVO> findWaybillListNotBillladingId(IPage<Object> page,@Param("param") BillladingDTO billladingDTO);
 
-    IPage<TrunklineBillladingDetailVO> billladingList(IPage<Object> page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
+    IPage<TrunklineBillladingDetailVO> billladingList(IPage<Object> page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr,@Param("customerTrain") String customerTrain);
 
 	List<TrunklineBillladingDetailListVO> findAdvanceDetailList(@Param("orderCode") String orderCode);
 

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

@@ -204,6 +204,9 @@ public class InComingServiceImpl implements IInComingService {
 		//把advanceDetailEntityList通过packageStatus分组
 		Map<String, List<TrunklineAdvanceDetailEntity>> advanceDetailEntityMap = advanceDetailEntityList.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getPackageStatus));
 
+		//把advanceDetailEntityList的orderCode提取成一个Set
+//		Set<String> orderCodes = advanceDetailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderCode).collect(Collectors.toSet());
+
 		String finalWarehouseName = warehouseName;
 		advanceDetailEntityMap.keySet().forEach(packageStatus -> {
 			List<TrunklineAdvanceDetailEntity> advanceDetailEntities = advanceDetailEntityMap.get(packageStatus);
@@ -326,6 +329,8 @@ public class InComingServiceImpl implements IInComingService {
 		});
 
 
+
+
 //		for (String packageCode : packageCodes) {
 //			log.info("############incomingPackage: 包件入库开始 packageCode={} billladingId={} warehouseId={}", packageCode, billladingId, warehouseId);
 //			//包件入库开始

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

@@ -726,7 +726,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		List<TrunklineAdvanceEntity> advanceEntityList = findListByIds(new ArrayList<>(advanceIdSet));
 
 		Map<String,TrunklineAdvanceEntity> advanceEntityMap = new HashMap<>();
-		if(advanceEntityList.isEmpty()){
+		if(!advanceEntityList.isEmpty()){
 			advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity()));
 		}
 
@@ -868,10 +868,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 					stockArticleEntity.setTransferQuantity(0);
 					stockArticleEntity.setSigninQuantity(0);
 					addStockArticleEntities.add(stockArticleEntity);
-				}else{
-					stockArticleEntity.setTotalNumber(total);
-					updateStockArticleEntities.add(stockArticleEntity);
 				}
+			}else{
+				stockArticleEntity.setTotalNumber(total);
+				updateStockArticleEntities.add(stockArticleEntity);
 			}
 		});
 		stockArticleClient.updateByBatchId(updateStockArticleEntities);
@@ -966,6 +966,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 		parcelListClient.addBatch(parcelListEntityList);
 
+		orderCodeSet.forEach(orderCode->{
+			stockArticleClient.updateOrderInfo(orderCode,warehouseId);
+		});
+
 
 //		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 //		String orderCode = advanceDetailEntity.getOrderCode();

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

@@ -612,7 +612,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		page.setSize(pageSize);
 
 		Map<String,Integer> map = baseMapper.billladingNum(warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr),customerTrain);
-		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
+		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr),customerTrain);
 
 		Map<String,Object> m = new HashMap<>();
 		if(!Objects.isNull(map)){