FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对过内外入库流程和企业入库流程增加校验

Browse Source
This commit is contained in:
SUNJIABIN
2023-02-24 13:50:41 +08:00
parent 57b9cf1ddc
commit 98d454739e
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+8
View File
@@ -5,6 +5,7 @@ import com.adc.da.common.BussEnum;
import com.adc.da.common.SarConformStateEnum;
import com.adc.da.common.SarStateColorEnum;
import com.adc.da.common.SarTypeEnum;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.ResponseMessage;
import com.adc.da.login.util.UserUtils;
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
@@ -387,6 +388,13 @@ public class ActSarItemsBussEOService {
sarBussionessStand.setSarStandAttrEOStr(resData);
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
Integer count = iSarBussionessStandService.count(queryWrapper);
if (count > 0){
throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
}
String standCode = "";
if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){
standCode = sarBussionessStand.getStandCode();
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+11
View File
@@ -4,6 +4,8 @@ import com.adc.da.common.PropertyTypeEnum;
import com.adc.da.common.SarConformStateEnum;
import com.adc.da.common.SarStateColorEnum;
import com.adc.da.common.SarTypeEnum;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.Result;
import com.adc.da.login.util.UserUtils;
import com.adc.da.person.entity.PersonMsgEO;
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
@@ -34,6 +36,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -189,6 +192,14 @@ public class ActSarItemsEOService {
// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData);
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName())
.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber());
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
throw new AdcDaBaseException("当前标准编号和中文名称已存在");
}
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
String standnumber = "";
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -1
View File
@@ -902,7 +902,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
.eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0);
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
return Result.error();
return Result.error("当前标准编号已存在");
}else {
return Result.success();
}