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

Merge remote-tracking branch 'origin/orderChange' into orderChange

Browse Source 
# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
zhairh
郑明梁 3 years ago
parent 989561cca6 1c6a433763
commit a23c20fa2d
4 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File

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

@ -158,7 +158,7 @@ public class UdiContrastController {
BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust); BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust);
udiInfoService.updateUdiInfo(udiInfoReqeust); udiInfoService.updateUdiInfo(udiInfoReqeust);
} }
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); // udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
String time = DateUtil.formatDateTime(new Date()); String time = DateUtil.formatDateTime(new Date());
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
@ -222,7 +222,7 @@ public class UdiContrastController {
udiRelevanceEntity.setThirdName(""); udiRelevanceEntity.setThirdName("");
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId()); UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
if (udiContrastService.isExit(temp.getOriginUuid(), null, null)) { if (udiContrastService.isExit(temp.getOriginUuid(), null, null)) {
return ResultVOUtils.error(500, "解除绑定失败！"); return ResultVOUtils.error(500, "解除绑定失败,存在未关联第三方产品信息DI！");
} }
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) { } else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
udiRelevanceEntity.setThirdId1(""); udiRelevanceEntity.setThirdId1("");

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

@ -284,58 +284,59 @@ public class UdiRelevanceController {
} }
//判断父id不为空就吧值给到id里面防止id变成详情id //判断父id不为空就吧值给到id里面防止id变成详情id
if(udiRelevanceResponse.getPid()!=null){ if (udiRelevanceResponse.getPid() != null) {
udiRelevanceResponse.setId(udiRelevanceResponse.getPid()); udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
} }
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); //更新关联表相关信息
udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceRequest);
udiRelevanceRequest.setId(udiRelevanceResponse.getId() + "");
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceRequest.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceRequest.setModifyTime(time);
if (udiRelevanceResponse.getIsUseDy() == 1) { if (udiRelevanceResponse.getIsUseDy() == 1) {
udiRelevanceEntity.setIsUseDy(true); udiRelevanceRequest.setIsUseDy(true);
} else udiRelevanceEntity.setIsUseDy(false); } else udiRelevanceRequest.setIsUseDy(false);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
if (!customerId.equals("110")) { if (!customerId.equals("110")) {
if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { if (StrUtil.isNotEmpty(udiRelevanceRequest.getPrice())) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + ""); //更新供应商关联表相关信息
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceRequest.getId(), customerId + "");
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceRequest.getPrice()));
companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity); companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
} }
} }
//更新产品信息表相关产品信息
UdiInfoRequest udiInfoEntity = new UdiInfoRequest(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoEntity.setSptm(udiRelevanceResponse.getSptm()); udiInfoRequest.setNameCode(udiRelevanceResponse.getNameCode());
udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm()); udiInfoRequest.setSptm(udiRelevanceResponse.getSptm());
udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); udiInfoRequest.setYbbm(udiRelevanceResponse.getYbbm());
udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); udiInfoRequest.setMeasname(udiRelevanceResponse.getMeasname());
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoRequest.setManufactory(udiRelevanceResponse.getManufactory());
// udiInfoEntity.setDiType(udiRelevanceResponse.getDiType()); udiInfoRequest.setCpms(udiRelevanceResponse.getCpms());
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); // udiInfoRequest.setDiType(udiRelevanceResponse.getDiType());
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); udiInfoRequest.setPrice(udiRelevanceResponse.getPrice());
udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl()); udiInfoRequest.setSpmc(udiRelevanceResponse.getSpmc());
udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); udiInfoRequest.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); udiInfoRequest.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); udiInfoRequest.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl()); udiInfoRequest.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoRequest.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoRequest.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); udiInfoRequest.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4()); udiInfoRequest.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5()); udiInfoRequest.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6()); udiInfoRequest.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7()); udiInfoRequest.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8()); udiInfoRequest.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
udiInfoRequest.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) { if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); udiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
} }
udiInfoEntity.setUuid(udiRelevanceResponse.getUuid()); udiInfoRequest.setUuid(udiRelevanceResponse.getUuid());
udiInfoService.updateUdiInfo(udiInfoEntity); udiInfoService.updateUdiInfo(udiInfoRequest);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }
@ -684,7 +685,7 @@ public class UdiRelevanceController {
@GetMapping("/udiwms/udirl/di/remove") @GetMapping("/udiwms/udirl/di/remove")
public BaseResponse removeDI(RemoveRelRequest removeRelRequest) { public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
if (udiRelevanceEntity==null || StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "未关联第三方产品ID，无法解除绑定！"); return ResultVOUtils.error(500, "未关联第三方产品ID，无法解除绑定！");
} }
List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId()); List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId());

2
api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java
Unescape Escape View File

@ -39,4 +39,6 @@ public class UdiRelevanceRequest {
private Integer useNum; //最小包装单元可使用次数 private Integer useNum; //最小包装单元可使用次数
} }

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

@ -356,7 +356,7 @@
<if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if> <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
<if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if> <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
</trim> </trim>
WHERE uuid = #{uuid} WHERE nameCode = #{nameCode}
</update> </update>
<select id="batchSelectByUuid" resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity"> <select id="batchSelectByUuid" resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">

Write Preview
Loading…
Cancel
Save