自主回库日志BUG,批量签收语音,异常状态

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java

@@ -74,7 +74,7 @@ public interface IDistributionDeliveryListClient {
 	 * @return
 	 */
 	@GetMapping(TOP+"/retentionDeliveryReservationPackage")
-    boolean retentionDeliveryReservationPackage(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("conditions") Integer conditions);
+    boolean retentionDeliveryReservationPackage(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("conditions") Integer conditions,@RequestParam("retentionType") Integer retentionType);
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java

@@ -69,8 +69,8 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 	}
 
 	@Override
-	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions) {
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
-		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions);
+		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions,retentionType);
 	}
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -364,7 +364,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param conditions
 	 * @return
 	 */
-	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions);
+	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType);
 
 	/**
 	 * 滞留取消库存品包件

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

@@ -777,9 +777,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 						DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListServiceById, DistributionAppParcelListVO.class);
 						loadingNum.getAndAdd(v.getPackageNub());
 						appParcelListVO.setScanStatus(3);
-						appParcelListVO.setIsAbnnormalSigning(1);
+						appParcelListVO.setIsScan("异常装车");
-						appParcelListVO.setIsAbnnormalSigningName("异常装车");
-						appParcelListVO.setIsScan("异常");
 						ks.add(appParcelListVO);
 					});
 					distributionAppStockArticleVO.setIsHaveAbnormalPackage(1);
@@ -815,7 +813,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 							DistributionAppParcelListVO parcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class);
 							assert parcelListVO != null;
 							parcelListVO.setScanStatus(3);
-							parcelListVO.setIsScan("异常");
+							parcelListVO.setIsScan("异常装车");
 							loadingNum.getAndAdd(parcelListEntity.getQuantity());
 							distributionAppParcelListVOS.add(parcelListVO);
 						}

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

@@ -6878,7 +6878,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	@Transactional
-	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions) {
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
 		if (Func.isEmpty(deliveryListEntity)) {
 			log.error("###########查询配送任务异常,deliveyId:{}", deliveryId);
@@ -6932,9 +6932,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				对应签收信息的装车数量要进行扣减
 			int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
 			//维护订单状态
-			String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "取消配送,取消方式:异常驳回,配送车次号:" + loadscanEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
+			String content = "";
-			JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode());
+			if (retentionType.equals(RetentionSourceTypeConstant.zizhuxinzeng.getValue())){
-			aaa.add(js);
+				content ="包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "取消配送,取消方式:自主回库,配送车次号:" + loadscanEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
+				JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode());
+				aaa.add(js);
+			}
 			//对滞留包件进行签收信息数量减少
 			//进行指定包件的相关订单维护
 			distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());

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

@@ -5881,7 +5881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L);
 		NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists);
 		iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
-		return R.status(true);
+		return Resp.scanSuccess((distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件",(distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件");
 	}
 
 	private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, Boolean isDriverFlag) {
@@ -8385,7 +8385,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionAppParcelListVOS.forEach(p -> {
 							p.setIsAbnormalLoading(1);
 							if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
-								p.setIsAbnnormalSigning(1);
+								p.setIsScan("异常签收");
 							}
 						});
 						distributionAppStockArticleVO.setDistributionAppParcelListVOS(distributionAppParcelListVOS);
@@ -8434,15 +8434,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 										distributionAppParcelListVO.setMaterialName(parcelListEntity.getMaterialName());
 										if (distributionLoadscanEntity.getIsAbnormalLoading().equals(2)) {
 											//异常装车
-											distributionAppParcelListVO.setIsAbnormalLoadingName("异常装车");
+											distributionAppParcelListVO.setIsScan("异常装车");
-											distributionAppParcelListVO.setIsAbnormalLoading(1);
 										}
 										if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 											//签收
 											if (distributionLoadscanEntity.getIsAbnormalSigning().equals(2)) {
 												//异常签收
-												distributionAppParcelListVO.setIsAbnnormalSigningName("异常签收");
+												distributionAppParcelListVO.setIsScan("异常签收");
-												distributionAppParcelListVO.setIsAbnnormalSigning(1);
+
 											}
 										}
 									}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -485,7 +485,8 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							warehouseRetentionScanEntity.getDeliveryId(),
 							warehouseRetentionScanEntity.getReservationId(),
 							warehouseRetentionScanEntity.getOrderPackageId(),
-							warehouseRetentionScanEntity.getConditions()
+							warehouseRetentionScanEntity.getConditions(),
+							warehouseRetentionScanEntity.getRetentionType();
 						);
 					}
 						result = distributionParcelListClient.maintainInWarehouse(warehouseRetentionScanEntity.getOrderPackageId(), warehouseRetentionScanEntity.getTaskCode());