diff --git a/src/main/java/com/spring/modules/rohs/controller/RohsController.java b/src/main/java/com/spring/modules/rohs/controller/RohsController.java index 52688469..92fb0142 100644 --- a/src/main/java/com/spring/modules/rohs/controller/RohsController.java +++ b/src/main/java/com/spring/modules/rohs/controller/RohsController.java @@ -278,7 +278,7 @@ public class RohsController { } /** - * 已完成且即将失效单据更新失效日期 + * 已完成单据更新失效日期 */ @PostMapping("/updateExpiryInfo") public R updateExpiryInfo(@RequestBody RohsEntity rohs) { diff --git a/src/main/java/com/spring/modules/rohs/service/RohsService.java b/src/main/java/com/spring/modules/rohs/service/RohsService.java index f6598bd5..4396ee6b 100644 --- a/src/main/java/com/spring/modules/rohs/service/RohsService.java +++ b/src/main/java/com/spring/modules/rohs/service/RohsService.java @@ -79,7 +79,7 @@ public interface RohsService extends IService { void removeMaterials(String site, String referenceNo); /** - * 已完成且即将失效单据更新失效日期相关字段 + * 已完成单据更新失效日期相关字段 */ RohsEntity updateCompletedExpiryInfo(RohsEntity rohs, String userName); diff --git a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java index d1bff2ed..334f06f8 100644 --- a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java +++ b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java @@ -506,9 +506,6 @@ public class RohsServiceImpl extends ServiceImpl impleme if (!"已完成".equals(exists.getStatus())) { throw new RuntimeException("仅已完成状态的单据允许更新失效日期"); } - if (!"Y".equalsIgnoreCase(StringUtils.trimToEmpty(exists.getIsExpiring()))) { - throw new RuntimeException("当前单据非即将失效状态,不允许更新失效日期"); - } if (rohs.getExpiredDate() == null) { throw new RuntimeException("报告日期不能为空"); }