UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.检查产品，添加第三方系统标识

Browse Source
fencang
x_z 3 years ago
parent 9b5509450e
commit 44bdc2c95c
3 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File

14
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class UdiContrastController {
//关联添加
if (StrUtil.isEmpty(combineRequest.getRelId()) || combineRequest.isIdSpliUdi()) {
if (StrUtil.isNotEmpty(combineRequest.getThirdId())) {
if (udiContrastService.isExit(key, combineRequest.getThirdId())) {
if (udiContrastService.isExit(key, combineRequest.getThirdId(), null)) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
createUnionContrast(combineRequest, key);
@ -105,7 +105,7 @@ public class UdiContrastController {
}
} else {
//只添加DI
if (udiContrastService.isExit(key, null)) {
if (udiContrastService.isExit(key, null, null)) {
return ResultVOUtils.error(500, "已存在该DI，且未对照！");
} else {
createOnlyUuid(combineRequest, key);
@ -113,7 +113,7 @@ public class UdiContrastController {
}
} else {//修改关联DI
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId())) {
if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId(), null)) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
updateDi(udiRelevanceEntity, key);
@ -125,7 +125,7 @@ public class UdiContrastController {
StringBuffer buffer = new StringBuffer();
//只添加产品
for (String thirdId : combineRequest.getThirdIds()) {
if (udiContrastService.isExit(null, thirdId)) {
if (udiContrastService.isExit(null, thirdId, null)) {
buffer.append(thirdId).append(",");
} else {
createOnlyMainId(combineRequest, thirdId);
@ -145,7 +145,7 @@ public class UdiContrastController {
@PostMapping("/udi/udirel/changeVersion")
public BaseResponse changeVersion(@RequestBody CombineRequest combineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId())) {
if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) {
return ResultVOUtils.error(500, "已存在相同的对照关系，无法切换版本");
}
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
@ -180,7 +180,7 @@ public class UdiContrastController {
udiRelevanceEntity.setSupName(combineRequest.getSupName());
udiRelevanceEntity.setPrice(combineRequest.getPrice());
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId())) {
if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), combineRequest.getThirdSys())) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
try {
@ -213,7 +213,7 @@ public class UdiContrastController {
udiRelevanceEntity.setThirdId("");
udiRelevanceEntity.setThirdName("");
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
if (udiContrastService.isExit(temp.getOriginUuid(), null)) {
if (udiContrastService.isExit(temp.getOriginUuid(), null, null)) {
return ResultVOUtils.error(500, "解除绑定失败！");
}
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) {

23
api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java
Unescape Escape View File

@ -7,7 +7,6 @@ import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
@ -28,9 +27,9 @@ public class UdiContrastService {
UdiRelevanceDao udiRelevanceDao;
public boolean isExit(String originUuid, String mainId) {
public boolean isExit(String originUuid, String mainId, String thirdSys) {
if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) {
if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId) && StrUtil.isBlank(thirdSys)) {
List<UdiRelevanceEntity> udiRelevanceEntities = findByUnion(originUuid, mainId);
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
return true;
@ -56,9 +55,23 @@ public class UdiContrastService {
}
}
return false;
} else return false;
} else if (StrUtil.isNotBlank(originUuid) && StrUtil.isNotBlank(mainId) && StrUtil.isNotBlank(thirdSys)) {
List<UdiRelevanceEntity> udiRelevanceEntities = findByUnion2(originUuid, mainId, thirdSys);
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
return true;
} else
return false;
}
return false;
}
private List<UdiRelevanceEntity> findByUnion2(String originUuid, String mainId, String thirdSys) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setMainId(mainId);
filterUdiInfoRequest.setOriginUuid(originUuid);
filterUdiInfoRequest.setThirdSys(thirdSys);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
public List<UdiRelevanceEntity> findByUnion(String originUuid, String mainId) {

17
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -325,6 +325,23 @@
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
<if test="thirdSys != '' and thirdSys != null">
<if test="thirdSys == 'thirdId'">
AND basic_udirel.thirdId = #{mainId}
</if>
<if test="thirdSys == 'thirdId1'">
AND basic_udirel.thirdId1 = #{mainId}
</if>
<if test="thirdSys == 'thirdId2'">
AND basic_udirel.thirdId2 = #{mainId}
</if>
<if test="thirdSys == 'thirdId3'">
AND basic_udirel.thirdId3 = #{mainId}
</if>
<if test="thirdSys == 'thirdId4'">
AND basic_udirel.thirdId4 = #{mainId}
</if>
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save