From 5ec6f40ac86af78fd10c4cf00346f2384fddd46b Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 29 Jul 2026 13:55:55 +0800 Subject: [PATCH] =?UTF-8?q?2026-07-29=20RoHS=EF=BC=9A=20=E3=80=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=E3=80=91=E5=92=8C?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=9C=A8=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=8D=B3=E5=B0=86=E5=A4=B1=E6=95=88=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/spring/modules/rohs/controller/RohsController.java | 2 +- src/main/java/com/spring/modules/rohs/service/RohsService.java | 2 +- .../com/spring/modules/rohs/service/impl/RohsServiceImpl.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) 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("报告日期不能为空"); }