Merge branch 'pre-production' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java

@@ -50,7 +50,7 @@ public class OrderPackageStatusDataHandler {
 
 
 		try{
-			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态>>>>>>>>>>>>>>>>>>>>>>>>>>");
+			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态 start>>>>>>>>>>>>>>>>>>>>>>>>>>");
 			Long myCurrentWarehouseId = Long.parseLong(map.get("myCurrentWarehouseId").toString());
 			String distrilbutionloadingscanDTOJson = (String)map.get("distrilbutionloadingscanDTO");
 			DistrilbutionloadingscanDTO distrilbutionloadingscanDTO = JSONObject.parseObject(distrilbutionloadingscanDTOJson,DistrilbutionloadingscanDTO.class);
@@ -69,6 +69,8 @@ public class OrderPackageStatusDataHandler {
 			distributionReservationService.maintenanceReservationInfo(reservationEntity.getId());
 			//维护配送任务信息
 			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
+			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态 end>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
 		}catch (Exception e){
 			log.error(">>>>>> 维护包件信息 报错",e);
 		}

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

@@ -673,7 +673,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				});
 
 
-				extracteOrderPackageStatus(distrilbutionloadingscanDTO, parcelListEntity, myCurrentWarehouse, reservationEntity);
+				//extracteOrderPackageStatus(distrilbutionloadingscanDTO, parcelListEntity, myCurrentWarehouse, reservationEntity);
 
 
 			} else if (parcelListEntityList.isEmpty()) {
@@ -1487,7 +1487,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R oneloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)) {
-			throw new CustomerException(403, "仓库信息不能为空");
+
+			return R.fail(403,"请选择仓库!!");
+//			throw n/**/ew CustomerException(403, "仓库信息不能为空");
 		}
 		/*
 		1. 通过查询这个所有的预约单

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

@@ -3604,44 +3604,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						}
 					}
 				}
-				break;
-			case 2:
-				//取消库存品包件
-				if (Func.isEmpty(distributionCancelReservationPackageDTO.getInventoryPackageIds())){
-					log.error(method+"InventoryPackageIds参数缺失");
-					return R.fail("请联系管理员....");
-				}
-				String[] invenPackageIds = distributionCancelReservationPackageDTO.getInventoryPackageIds().split(",");
-				List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionCancelReservationPackageDTO.getReservationId());
-				if (Func.isNotEmpty(disStockListDetailEntities)){
-					for (String invenPackageId : invenPackageIds) {
-						List<DisStockListDetailEntity> inventory = disStockListDetailEntities.stream().filter(inven -> inven.getId().equals(Long.parseLong(invenPackageId))).collect(Collectors.toList());
-						if (Func.isNotEmpty(inventory) &&inventory.size() == 1){
-							DisStockListDetailEntity disStockListDetailEntity = inventory.get(0);
-							if (disStockListDetailEntity.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())
-								||disStockListDetailEntity.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())){
-								log.info(method+"检测当前取消包件存在装车或者签收操作:inventoryPackageId{}",disStockListDetailEntity.getId());
-								throw  new RuntimeException("包件存在装车、签收,无法进行取消");
-							}
-							//库存品配送包件的取消操作
-							disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue());
-							disStockListDetailService.updateById(disStockListDetailEntity);
-							//维护对应预约的配送库存品品类数据
-							distributionReservationStocklistService.maintenanceReservationStockList(distributionCancelReservationPackageDTO.getReservationId());
-							//进行冻结数量的扣减
-							distributionStockListMapper.decreaseStockListQuantityOccupied(disStockListDetailEntity.getStockListId(),disStockListDetailEntity.getNum());
-						}else {
-							log.error(method+"库存品包件信息异常");;
-							throw  new RuntimeException("库存品包件信息异常");
-						}
-
-					}
-				}else {
-					log.error(method+"预约单没有库存品包件");
-					return R.fail("此预约任务无库存品包件....");
-				}
-				break;
-			default:
 				//维护预约单状态
 				this.maintenanceReservationInfo(distributionCancelReservationPackageDTO.getReservationId());
 				//维护预约单数量

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

@@ -1082,7 +1082,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
 			if (Func.isNotEmpty(loadscanEntity)) {
 				if (loadscanEntity.getSignforState().equals(2)) {
-					return Resp.scanFail("重复扫描", "重复扫描");
+					return Resp.scanFail("重复扫描", "包件已签收");
 				}
 				//存在装车记录，进行修改即可
 				//进行签收记录数据的维护
@@ -1213,7 +1213,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//判断客户
 				boolean flag = judgmentClient(distributionReservationEntity, parcelListEntity.getStockArticleId());
 				if (flag) {
-					return R.fail(3006, "异常签收");
+					if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
+						return Resp.scanFail("包件已签收", "包件已签收");
+					}else {
+						return R.fail(3006, null);
+					}
 				} else {
 					return Resp.scanFail("不满足签收条件", "不满足签收条件");
 				}
@@ -1571,7 +1575,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		if (signforEntity.getReceivedQuantity() <= 0){
 			log.error("signforack############未进行签收上传图片");
-			return Resp.scanFail("请先进行签收扫描后上传图片","请先进行签收扫描后上传图片");
+			return Resp.scanFail(12000,"请先进行签收扫描后上传图片","请先进行签收扫描后上传图片",null);
 		}
 
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -1616,7 +1620,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isNotEmpty(parcelListEntityList) && parcelListEntityList.size() == 1) {
 			DistributionParcelListEntity parcelListEntity = parcelListEntityList.get(0);
 			if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
-				return Resp.scanFail("操作失败", "包件信息有误");
+				return Resp.scanFail("操作失败", "该包件已签收");
 			}
 			//确认该包件确实不属于该配送任务
 			List<DistributionParcelListEntity> parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
@@ -2161,7 +2165,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<DistributionAppStockArticleVO> getAppDeliveryorderListPage( DistributionAppDeliveryListDTO distributionDeliveryList) {
-		if (Func.isNotEmpty(distributionDeliveryList.getReservationId())) {
+		if (Func.isEmpty(distributionDeliveryList.getReservationId())) {
 			log.error("参数缺失reservationId:{}", distributionDeliveryList.getReservationId());
 		}
 
@@ -2633,7 +2637,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		BladeUser user = AuthUtil.getUser();
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)) {
-			throw new CustomerException(403, "仓库信息不能为空");
+			return R.fail(403,"仓库信息不能为空");
+//			throw new CustomerException(403, "仓库信息不能为/**/空");
 		}
 
 //		------------------------------------2023-09-08  一键签收调整------------------------------------------