|
|
@@ -20,6 +20,7 @@ import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
|
|
|
import com.rongwei.rwadmincommon.system.vo.SysUserVo;
|
|
|
import com.rongwei.rwcommon.base.BaseDo;
|
|
|
import com.rongwei.rwcommon.base.R;
|
|
|
+import com.rongwei.rwcommon.base.exception.CustomException;
|
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
|
import com.rongwei.rwcommonentity.commonservers.domain.SysMindMappingDo;
|
|
|
@@ -2123,6 +2124,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
if (apsProcessOperationDo == null && StringUtils.isNotBlank(cancelProcessOperationVo.getProcessid())) {
|
|
|
apsProcessOperationDo = apsProcessOperationService.getById(cancelProcessOperationVo.getProcessid());
|
|
|
}
|
|
|
+
|
|
|
+ //查询坯料计划是否正在被排程或者已排程
|
|
|
+ if (!apsProcessOperationDo.getProcessstatus().equals("30") && !apsProcessOperationDo.getProcessstatus().equals("40")) {
|
|
|
+ throw new CustomException("该作业生产状态已被其他人修改，请刷新页面后重新进入");
|
|
|
+ }
|
|
|
+
|
|
|
//先更新本道作业明细取消卷数
|
|
|
String euqwhr = "";
|
|
|
if (StringUtils.isNotBlank(cancelProcessOperationVo.getProcessequid())) {
|
DLC