diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 77a836a9e..39e74e297 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -963,9 +963,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl dtoList; @@ -981,9 +979,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name"))); if (ObjectUtils.isEmpty(dtoList)) { - result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); - result.put("message", "子卷号或点位信息有误,请核对是否存在!"); - return result; + throw new BadRequestException("子卷号或点位信息有误,请核对是否存在!"); } if (dtoList.size() > 1) { result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); @@ -1051,15 +1047,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl0){ - throw new BadRequestException("当前人工管制点已经存在任务,请勿重复下发"); + throw new BadRequestException("当前人工管制点存在任务,稍后操作"); + } + if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))){ + autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); } - autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); - dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1") ? "ZXQ_135" : "ZXQ_136")); updateWrapper.set("container_name", null); updateWrapper.set("ivt_status", whereJson.getString("ivt_status"));