|
@@ -1479,6 +1479,11 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
*/
|
|
|
private String checkParam4Cancel(InsideOperDto operDto, InsideInspectionRequest dto) {
|
|
|
SysUserVo currUser = zhcxCommon.getCurrentUser();
|
|
|
+
|
|
|
+ if("execute".equals(dto.getPageType()) && ObjectUtil.isEmpty(operDto.getDispatch().getSupervisionid())) {
|
|
|
+ return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("未派单,请先派单再执行");
|
|
|
+ }
|
|
|
+
|
|
|
//报验完成
|
|
|
if("30".equals(operDto.getInspection().getInspectionstatus())) {
|
|
|
return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("检验员已提交报验结论不能取消,请刷新数据查看");
|