|
|
@@ -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;
|
|
|
@@ -2163,7 +2164,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
}
|
|
|
boolean inlist = false;
|
|
|
for (ApsProcessOperationProcessEquDo operationProcessEquDo : operationequrollsall) {
|
|
|
- if (operationProcessEquDo.getProcessid().equals(newOperDo.getId()) && !operationProcessEquDo.getRoption().contains(processOperationProcessEquDo.getId())) {
|
|
|
+ if (operationProcessEquDo.getProcessid().equals(newOperDo.getId())&&StringUtils.isNotBlank(operationProcessEquDo.getRoption()) && !operationProcessEquDo.getRoption().contains(processOperationProcessEquDo.getId())) {
|
|
|
inlist = true;
|
|
|
operationProcessEquDo.setCancelrollno(operationProcessEquDo.getCancelrollno() + processOperationProcessEquDo.getCancelrollno());//已取消卷数合计
|
|
|
operationProcessEquDo.setInputunqualifiednum(operationProcessEquDo.getInputunqualifiednum() + processOperationProcessEquDo.getInputunqualifiednum());//输入不合格卷数合计
|
|
|
@@ -2356,7 +2357,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
log.info("更新后面所有工序信息异常");
|
|
|
- return R.error(e.getMessage());
|
|
|
+ throw new CustomException(e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
|
DLC