Browse Source

2026-07-29

RoHS:
【更新失效日期】和附件操作不在判断即将失效标识
master
fengyuan_yang 3 days ago
parent
commit
5ec6f40ac8
  1. 2
      src/main/java/com/spring/modules/rohs/controller/RohsController.java
  2. 2
      src/main/java/com/spring/modules/rohs/service/RohsService.java
  3. 3
      src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java

2
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) {

2
src/main/java/com/spring/modules/rohs/service/RohsService.java

@ -79,7 +79,7 @@ public interface RohsService extends IService<RohsEntity> {
void removeMaterials(String site, String referenceNo);
/**
* 已完成且即将失效单据更新失效日期相关字段
* 已完成单据更新失效日期相关字段
*/
RohsEntity updateCompletedExpiryInfo(RohsEntity rohs, String userName);

3
src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java

@ -506,9 +506,6 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> 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("报告日期不能为空");
}

Loading…
Cancel
Save