|
|
@ -106,10 +106,6 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageUtils queryPoPage(InspectionRequestItemVO data) { |
|
|
public PageUtils queryPoPage(InspectionRequestItemVO data) { |
|
|
if (!StringUtils.hasText(data.getSite())) { |
|
|
|
|
|
SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
|
|
data.setSite(currentUser.getSite()); |
|
|
|
|
|
} |
|
|
|
|
|
IPage<InspectionRequestItemVO> page = |
|
|
IPage<InspectionRequestItemVO> page = |
|
|
baseMapper.queryPoPage(new Page<>(data.getPage(), data.getLimit()), data); |
|
|
baseMapper.queryPoPage(new Page<>(data.getPage(), data.getLimit()), data); |
|
|
return new PageUtils(page); |
|
|
return new PageUtils(page); |
|
|
@ -280,7 +276,7 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 只有状态为草稿和已确认的验货申请允许删除 |
|
|
// 只有状态为草稿和已确认的验货申请允许删除 |
|
|
if (!"草稿".equals(header.getStatus()) && !"已确认".equals(header.getStatus())) { |
|
|
|
|
|
|
|
|
if (!"草稿".equals(header.getStatus()) && !"已确认".equals(header.getStatus()) && !"已审核".equals(header.getStatus())) { |
|
|
throw new RuntimeException("只有状态为草稿和已确认的验货申请允许删除,当前状态:" + header.getStatus()); |
|
|
throw new RuntimeException("只有状态为草稿和已确认的验货申请允许删除,当前状态:" + header.getStatus()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -321,11 +317,8 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
int detailDeleteCount = inspectionRequestDetailMapper.deleteByRequestNo(site, requestNo); |
|
|
int detailDeleteCount = inspectionRequestDetailMapper.deleteByRequestNo(site, requestNo); |
|
|
log.info("删除明细记录数: {}", detailDeleteCount); |
|
|
log.info("删除明细记录数: {}", detailDeleteCount); |
|
|
|
|
|
|
|
|
// 5. 删除费用表 srm_inspect_request_fee(如果存在) |
|
|
|
|
|
// 注意:根据代码搜索,该表可能不存在,这里暂时跳过 |
|
|
|
|
|
// 如果后续需要,可以添加对应的Mapper和删除逻辑 |
|
|
|
|
|
|
|
|
|
|
|
// 6. 删除头表 srm_inspection_request_header |
|
|
|
|
|
|
|
|
// 删除头表 srm_inspection_request_header |
|
|
int headerDeleteCount = baseMapper.deleteByRequestNo(site, requestNo); |
|
|
int headerDeleteCount = baseMapper.deleteByRequestNo(site, requestNo); |
|
|
log.info("删除头表记录数: {}", headerDeleteCount); |
|
|
log.info("删除头表记录数: {}", headerDeleteCount); |
|
|
|
|
|
|
|
|
|