Browse Source

Merge remote-tracking branch 'origin/master'

master
rui_li 2 days ago
parent
commit
ded620e6c0
  1. 10
      src/main/java/com/spring/modules/rohs/controller/RohsController.java

10
src/main/java/com/spring/modules/rohs/controller/RohsController.java

@ -286,7 +286,7 @@ public class RohsController {
} }
/** /**
* 删除 (扩展)
* 删除仅草稿
*/ */
@PostMapping("/delete") @PostMapping("/delete")
@Transactional @Transactional
@ -294,6 +294,14 @@ public class RohsController {
if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) { if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) {
return R.error("工厂(site)和序列号(referenceNo)不能为空"); return R.error("工厂(site)和序列号(referenceNo)不能为空");
} }
RohsEntity exists = rohsService.getDetail(rohs.getSite(), rohs.getReferenceNo());
if (exists == null) {
return R.error("未找到对应RoHs单据");
}
if (!"草稿".equals(exists.getStatus())) {
return R.error("仅草稿状态的单据允许删除");
}
QueryWrapper<RohsEntity> deleteWrapper = new QueryWrapper<>(); QueryWrapper<RohsEntity> deleteWrapper = new QueryWrapper<>();
deleteWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo()); deleteWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo());

Loading…
Cancel
Save