Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0

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

@@ -488,4 +488,11 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	Integer signforNum(@Param("reservationId")Long reservationId);
+
+	/**
+	 * 查询当前客户总装车数
+	 * @param reservationId
+	 * @return
+	 */
+	Integer loadingNum(@Param("reservationId")Long reservationId);
 }

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

@@ -2346,5 +2346,9 @@
     <select id="signforNum" resultType="java.lang.Integer">
         SELECT received_quantity+receivedin_quantity FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
     </select>
+    <select id="loadingNum" resultType="java.lang.Integer">
+        SELECT loaded_number+loadedin_number FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
+
+    </select>
 
 </mapper>

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

@@ -9404,10 +9404,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.ne(DistributionLoadscanEntity::getIsAbnormalLoading, 2)
 			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);
-		int abnormalTotal = 0;
-		if (Func.isNotEmpty(abnormalLoadingPack)) {
-			abnormalTotal = abnormalLoadingPack.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
-		}
 		if (!packageLockIds.isEmpty()) {
 			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryList.getTrainNumber() + ":orderPackageIds:");
 			if (!Objects.isNull(a)) {
@@ -9424,7 +9420,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 		}
 		trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
-		return Resp.scanSuccess("操作成功", "装车" + abnormalTotal + "件");
+		Integer loadingNum = distributionSignforMapper.loadingNum(reservationEntity.getId());
+		return Resp.scanSuccess("装车" + loadingNum + "件", "装车" + loadingNum + "件");
 	}
 
 	@Override

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

@@ -3175,6 +3175,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (!Objects.isNull(warehouseConfig.getIsStrictLoading())){
 				 isStrictLoading = warehouseConfig.getIsStrictLoading();
 			}
+			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
+				return R.fail("因严格装车要求,需在PDA完成!!");
+			}
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
 			if (Func.isEmpty(distributionReservationEntity)) {
 				log.error("########无效的预约单,reservationId:{}", distrilbutionloadingscanDTO.getReservationId());
@@ -3273,13 +3276,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						aaa.add(trunklinePackageTrackLog);
 					} else {
-						if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading){
-							return R.fail("当前操作需由司机完成");
-						}
-						BladeUser user = AuthUtil.getUser();
-						Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
 						//这里装车的数据需要进行补录
-						DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,driver);
+						DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
+						if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
+							distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
+								.eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES)
+								.eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
+							);
+						} else {
+							DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper<DistributionDeliveryTripartiteEntity>().lambda()
+								.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));
+							BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
+							distributionDeliverySelfEntity.setVehicleNub(distributionDeliveryTripartiteEntity.getVehicleNum());
+						}
 						DistributionDeliveryListEntity listEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 						if (Func.isEmpty(listEntity)) {
 							log.error("##########配送计划异常：{}", listEntity);
@@ -7812,9 +7821,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(parcelListEntity.getOrderPackageReservationStatus())) {
 							return Resp.scanFail("当前包件存在配送计划", "当前包件存在配送计划");
 						}
+						if (deliveryListEntity.getKind().equals("2")){
+							return Resp.scanFail("外协无法异常签收", "外协无法异常签收");
+						}
 						return R.fail(3006, null);
 					} else {
-
 						return Resp.scanFail("不属于当前签收客户", "不属于当前签收客户");
 					}
 				}
@@ -9064,7 +9075,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
-		if (!distributionLoadscanEntity.getLoadedNub().equals(distributionLoadscanEntity.getReceivedQuantity())) {
+		if (distributionLoadscanEntity.getLoadedNub().equals(distributionLoadscanEntity.getReceivedQuantity())) {
 			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
 		return distributionLoadscanEntity;

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

@@ -2102,10 +2102,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					//维护订单的在库件数
 					stockArticleEntity.setHandQuantity(inWarehouseQuantity);
 					//维护订单的配送件数
-//					deliveryQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getDeliveryQuantity).sum() + parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getSigninQuantity).sum() + parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getOutboundQuantity).sum();
 					stockArticleEntity.setDeliveryQuantity(loadingQuantity);
 					stockArticleEntity.setSigninQuantity(signingQuantity);
-//					stockArticleEntity.setDeliveryQuantity(deliveryQuantity);
 					if (inWarehouseQuantity > 0) {
 						stockArticleEntity.setGenre(1);
 					}