增加详情装车限制

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

@@ -8781,6 +8781,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//查询是否满足计划  以及计划在哪个客户中
 				Long reservationId = baseMapper.selectPackageByorderPackageCodeAndDeliveryId(orderPackageCode, deliveryId, warehouseId);
 				if (Objects.isNull(reservationId)) {
+					DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+
+					if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
+						if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
+							return Resp.scanFail("请在"+reservationEntity.getConsignee()+"客户扫描此码", "请在"+reservationEntity.getConsignee()+"客户扫描此码");
+						}
+					}
 					//当前包件是预约状态  无法进行异常装车
 					if (OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(parcelListEntity.getOrderPackageReservationStatus())) {
 						return Resp.scanFail("此包件存在计划", "此包件存在计划");
@@ -8803,7 +8810,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					}
 					return Resp.scanFail("窜货", "窜货");
 				}
-				DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
 				//正常进行装车
 				DistributionLoadscanEntity loadscanEntity = createdDistributionLoadscanEntity(deliveryListEntity, distributionDeliverySelfEntity, reservationId, parcelListEntity, myCurrentWarehouse, user);
 				distributionLoadscanService.save(loadscanEntity);
@@ -9001,6 +9007,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//查询库存品
 				reservationId = baseMapper.selectInventoryPackageByDeliveryIdAndInventoryPackageCode(deliveryId, inventoryPackageCode);
 				if (Objects.isNull(reservationId)) {
+					DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+
+					if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
+						if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
+							return Resp.scanFail("请在"+reservationEntity.getConsignee()+"客户扫描此码", "请在"+reservationEntity.getConsignee()+"客户扫描此码");
+						}
+					}
 					parcelListEntity = distributionParcelListMapper.selectByOrderPackageCode(inventoryPackageCode, myCurrentWarehouse.getId());
 					if (!Objects.isNull(parcelListEntity)) {
 						return Resp.scanFail("请在定制品页面扫描此码", "请在定制品页面扫描此码");

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

@@ -3246,6 +3246,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 						distributionLoadscanEntity.setSignforState(2);
 						distributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub());
+						distributionLoadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+						distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 
 
 						distributionLoadscanEntity.setSigningUser(nickName);
@@ -3264,10 +3266,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (StringUtils.isNotBlank(distributionLoadscanEntity.getOrderPackageCode())) {
 							//下架解托
 							warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
-
 						}
-
-
 						content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,装车方式:扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
 						try {
 							trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionLoadscanEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());