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

更换basicUdirel表实体类

Browse Source
zhairh
郑明梁 3 years ago
parent 7574c7fa9c
commit dbf918e955
10 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -15,6 +15,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.RemoveRelRequest; import com.glxp.sale.admin.req.basic.RemoveRelRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
@ -163,7 +164,9 @@ public class UdiContrastController {
String time = DateUtil.formatDateTime(new Date()); String time = DateUtil.formatDateTime(new Date());
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
return ResultVOUtils.success("切换成功！"); return ResultVOUtils.success("切换成功！");
} }
@ -189,7 +192,9 @@ public class UdiContrastController {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else { } else {
try { try {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} catch (Exception e) { } catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} }
@ -241,7 +246,9 @@ public class UdiContrastController {
udiRelevanceEntity.setPrice(""); udiRelevanceEntity.setPrice("");
udiRelevanceEntity.setManufactory(""); udiRelevanceEntity.setManufactory("");
udiRelevanceEntity.setMeasname(""); udiRelevanceEntity.setMeasname("");
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResultVOUtils.error(500, "解除绑定失败！"); return ResultVOUtils.error(500, "解除绑定失败！");
@ -367,7 +374,9 @@ public class UdiContrastController {
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
insertUdiInfos(udiInfoEntities); insertUdiInfos(udiInfoEntities);
} }

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

@ -293,7 +293,9 @@ public class UdiRelevanceController {
if (udiRelevanceResponse.getIsUseDy() == 1) { if (udiRelevanceResponse.getIsUseDy() == 1) {
udiRelevanceEntity.setIsUseDy(true); udiRelevanceEntity.setIsUseDy(true);
} else udiRelevanceEntity.setIsUseDy(false); } else udiRelevanceEntity.setIsUseDy(false);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
if (!customerId.equals("110")) { if (!customerId.equals("110")) {
if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) {
@ -707,7 +709,9 @@ public class UdiRelevanceController {
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
return ResultVOUtils.success("解除绑定成功！"); return ResultVOUtils.success("解除绑定成功！");
} }
@ -727,7 +731,9 @@ public class UdiRelevanceController {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(id); udiRelevanceEntity.setId(id);
udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus()); udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} }
return ResultVOUtils.success("更新成功！"); return ResultVOUtils.success("更新成功！");
} else { } else {

5
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
@ -125,7 +126,9 @@ public class ThrProductsAddController {
String time = DateUtil.formatDateTime(new Date()); String time = DateUtil.formatDateTime(new Date());
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} }

11
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java
Unescape Escape View File

@ -13,10 +13,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity;
import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.*;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.SupplementRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.inout.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
@ -204,9 +201,9 @@ public class ThrProductsAddDiController {
udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
udiInfoService.updateUdiInfo(udiInfoRequest); udiInfoService.updateUdiInfo(udiInfoRequest);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
// udiInfoService.updateUdiInfo(udiInfoEntity); // udiInfoService.updateUdiInfo(udiInfoEntity);
//回填关联关系到关联表 //回填关联关系到关联表
CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();

3
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.basic;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -36,7 +37,7 @@ public interface UdiRelevanceDao {
boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);

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

@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.basic;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -54,7 +55,7 @@ public interface UdiRelevanceService {
boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
boolean deleteById(String id); boolean deleteById(String id);

25
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@ -268,26 +269,26 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
} }
@Override @Override
public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { public boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest) {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
String mainSys = basicThirdSysEntity.getThirdId(); String mainSys = basicThirdSysEntity.getThirdId();
if (mainSys.equals("thirdId")) { if (mainSys.equals("thirdId")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName()); udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName());
} else if (mainSys.equals("thirdId1")) { } else if (mainSys.equals("thirdId1")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId1());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1()); udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName1());
} else if (mainSys.equals("thirdId2")) { } else if (mainSys.equals("thirdId2")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId2());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2()); udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName2());
} else if (mainSys.equals("thirdId3")) { } else if (mainSys.equals("thirdId3")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId3());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3()); udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName3());
} else if (mainSys.equals("thirdId4")) { } else if (mainSys.equals("thirdId4")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId4());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4()); udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName4());
} }
return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); return udiRelevanceDao.updateUdiRelevance(udiRelevanceRequest);
} }
@Override @Override

5
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.basic.*;
@ -163,7 +164,9 @@ public class BasicUdiInfoImportService {
UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(udiInfoEntity.getUuid(), mainId); UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(udiInfoEntity.getUuid(), mainId);
if (temp != null) { if (temp != null) {
updateValue(temp, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); updateValue(temp, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId);
udiRelevanceService.updateUdiRelevance(temp); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(temp,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} else { } else {
UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId); UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId);
if (mTemp != null) { if (mTemp != null) {

5
api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.SupplementRequest;
import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
@ -44,7 +45,9 @@ public class CompanyProductsRelService {
SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);
BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
udiInfoService.updateUdiInfo(udiInfoRequest); udiInfoService.updateUdiInfo(udiInfoRequest);
companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setCreate_time(new Date());
companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date());

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

@ -532,7 +532,7 @@
WHERE uuid = #{uuid} WHERE uuid = #{uuid}
</delete> </delete>
<update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> <update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.req.basic.UdiRelevanceRequest">
UPDATE basic_udirel UPDATE basic_udirel
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if> <if test="thirdId != null">thirdId=#{thirdId},</if>

Write Preview
Loading…
Cancel
Save