Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -44,6 +44,7 @@ public enum WorkNodeEnums implements Serializable {
 	PLAN_BILLOFLADING(263, "计划自提"),
 	CANCEL_BILLOFLADING(264, "取消自提"),
 	PLAN_DISTRIBUTION(265, "计划配车"),
+	CANCEL_DISTRIBUTION(266, "取消配车"),
 	DISTRIBUTION_LOADING(270, "配送装车"),
 	DISTRIBUTION_ABNORMAL_LOADING(271, "异常装车"),
 	DISTRIBUTION_CANCEL_LOADING(272, "取消装车"),

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java

@@ -32,4 +32,6 @@ public class InComingDTO implements Serializable {
 	private String tenantId;
 	private String nickName;
 
+	private String customerTrain;
+
 }

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

@@ -121,6 +121,8 @@
         FROM
         logpm_distribution_stockup_info AS ldsi
         LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
+        WHERE
+        ldsi.stock_status != 4
         ) AS t ON t.reservation_id = lds.reservation_id
         <where>
             lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
@@ -797,6 +799,7 @@ FROM
         LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
         WHERE
         ldsi.reservation_id = lds.reservation_id
+        ldsi.stock_status != 4
         ) AS forkliftName,
         CASE
         WHEN ldr.stockup_status ='10' THEN '待指派'

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

@@ -322,13 +322,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//转移数据到VO上
 		DistributionDeliveryListVO distributionDeliveryListVO = DistributionDeliveryListWrapper.build().entityVO(detail);
 
-		//查询包条数据
-//		List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
-		//distributionDeliveryListVO.setPackadeList(stripList);
-		//装车件数
-		//Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());
-		//	distributionDeliveryListVO.setLoadNub(sum);
-		//	if (detail.getSource() == 1) {
 		//查询客户信息
 		List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
 		if (!customList.isEmpty()) {
@@ -3985,6 +3978,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//客户数量
 		AtomicInteger clientTotal = new AtomicInteger();
 		List<Long> newIds = new ArrayList<>();
+		List<Long> oldIds = new ArrayList<>();
 		newReservation.forEach((k, v) -> {
 			clientTotal.getAndIncrement();
 			//统计配送包件总数量
@@ -4017,6 +4011,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				.in(DistributionReservationEntity::getId,newIds)
 				.set(DistributionReservationEntity::getReservationStatus,ReservationStatusConstant.daipeisong.getValue())
 			);
+			String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"转车次任务,操作方式:车次添加预约计划,车次号:"+deliveryListEntity.getTrainNumber();
+			distributionAsyncService.recordsReservationDeliveryLog(newIds,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.PLAN_DISTRIBUTION.getCode(),content);
 		}
 
 		oldReservation.forEach((m, n) -> {
@@ -4034,7 +4030,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				.eq(DistributionStockupInfoEntity::getReservationId,reservationEntity.getId())
 				.set(DistributionStockupInfoEntity::getStockStatus,"4")
 			);
+			oldIds.add(reservationEntity.getId());
 		});
+		if (!oldIds.isEmpty()) {
+			String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"取消配车计划,操作方式:车次移除预约计划,车次号:"+deliveryListEntity.getTrainNumber();
+			String ids = oldIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+			distributionAsyncService.recordsReservationDeliveryLog(ids,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(),content);
+		}
+
 		//修改备货信息
 		String kind = deliveryListEntity.getKind();
 		switch (kind) {
@@ -4117,14 +4120,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		deliveryListEntity.setDeliveryNumber(packageTotal.get());
 		deliveryListEntity.setInventoryNub(inventoryTotal.get());
-//		if (Func.isNotEmpty(stockupInfo.getUnloaderName()) && Func.isNotEmpty(stockupInfo.getUnloaderId())) {
-//			deliveryListEntity.setUnloadingTeamId(stockupInfo.getUnloaderId());
-//			deliveryListEntity.setUnloadingTeamName(stockupInfo.getUnloaderName());
-//		}
-//		if (Func.isNotEmpty(stockupInfo.getLoaderId()) && Func.isNotEmpty(stockupInfo.getLoaderName())) {
-//			deliveryListEntity.setUnloadingTeamId(stockupInfo.getLoaderId());
-//			deliveryListEntity.setUnloadingTeamName(stockupInfo.getLoaderName());
-//		}
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);

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

@@ -158,7 +158,7 @@
                 and ltad.incoming_time <= #{endByDateStr}
                 and ltad.incoming_warehouse_id = #{warehouseId}
                 <if test="customerTrain != null and customerTrain != ''">
-                    and ltad.customer_train = #{customerTrain}
+                    and ltad.train_number = #{customerTrain}
                 </if>
               group by ltad.advance_id) t
                  left join logpm_trunkline_advance lta on lta.id = t.advanceId
@@ -183,7 +183,7 @@
             and ltad.incoming_time &lt;= #{endByDateStr}
             and ltad.incoming_warehouse_id = #{warehouseId}
             <if test="customerTrain != null and customerTrain != ''">
-                and ltad.customer_train = #{customerTrain}
+                and ltad.train_number = #{customerTrain}
             </if>
           group by ltad.advance_id) t
              left join logpm_trunkline_advance lta on lta.id = t.advanceId

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

@@ -197,6 +197,7 @@ public class InComingServiceImpl implements IInComingService {
 		Integer incomingType = inComingDTO.getIncomingType();//入库类型 1码板打托 2扫码入库  3直接入库 4 按车次号入库 5按订单入库 6扫描入库 7 批量卸车入库 8卸车托盘 9卸分一体 10补录数据入库
 		String trayCode = inComingDTO.getTrayCode();//托盘码
 		String trayType = inComingDTO.getTrayType();//打托方式
+		String customerTrain = inComingDTO.getCustomerTrain();//车次号
 
 		List<String> packageCodes = Arrays.asList(orderPackageCode.split(","));
 		log.info("############incomingPackage: 包件入库开始 packageCodes={} billladingId={} warehouseId={}", packageCodes, billladingId, warehouseId);
@@ -209,6 +210,15 @@ public class InComingServiceImpl implements IInComingService {
 			log.warn("############incomingPackage: 包件不存在 packageCodes={} warehouseId={}", packageCodes, warehouseId);
 			return Resp.scanFail(405, "包件无数据", "包件无数据");
 		}
+		if(StringUtil.isNotBlank(customerTrain)){
+			for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) {
+				String trainNumber = advanceDetailEntity.getTrainNumber();
+				if(!trainNumber.equals(customerTrain)){
+					log.warn("############incomingPackage: 包件车次号不一致 packageCodes={} trainNumber={} trainNumber={}", packageCodes, trainNumber, customerTrain);
+					return Resp.scanFail(405, "包件车次号不一致", "包件车次号不一致");
+				}
+			}
+		}
 
 		//把advanceDetailEntityList通过packageStatus分组
 		Map<String, List<TrunklineAdvanceDetailEntity>> advanceDetailEntityMap = advanceDetailEntityList.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getPackageStatus));