|
|
|
|
@ -294,46 +294,53 @@ public class UdiRelevanceController {
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
|
|
|
|
|
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity);
|
|
|
|
|
String time = DateUtil.getDateTime();
|
|
|
|
|
udiRelevanceEntity.setUpdateTime(time);
|
|
|
|
|
udiRelevanceEntity.setModifyTime(time);
|
|
|
|
|
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
|
|
|
|
|
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
|
|
|
|
|
//根据uuid查询id
|
|
|
|
|
List<UdiRelevanceEntity> udiRelevanceEntityList=udiRelevanceDao.selectByUuid(udiRelevanceEntity.getUuid());
|
|
|
|
|
if(udiRelevanceEntityList.size()>0){
|
|
|
|
|
String id=udiRelevanceEntityList.get(0).getId();
|
|
|
|
|
udiRelevanceRequest.setId(id);
|
|
|
|
|
|
|
|
|
|
//判断父id不为空就吧值给到id里面防止id变成详情id
|
|
|
|
|
if (udiRelevanceResponse.getPid() != null) {
|
|
|
|
|
udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
|
|
|
|
|
}
|
|
|
|
|
//更新关联表相关信息
|
|
|
|
|
UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
|
|
|
|
|
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceRequest);
|
|
|
|
|
udiRelevanceRequest.setId(udiRelevanceResponse.getId() + "");
|
|
|
|
|
String time = DateUtil.getDateTime();
|
|
|
|
|
udiRelevanceRequest.setUpdateTime(time);
|
|
|
|
|
udiRelevanceRequest.setModifyTime(time);
|
|
|
|
|
if (udiRelevanceResponse.getIsUseDy() == 1) {
|
|
|
|
|
udiRelevanceRequest.setIsUseDy(true);
|
|
|
|
|
} else udiRelevanceRequest.setIsUseDy(false);
|
|
|
|
|
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
|
|
|
|
|
|
|
|
|
|
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
|
|
|
|
|
udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
|
|
|
|
|
udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
|
|
|
|
|
udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
|
|
|
|
|
udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
|
|
|
|
|
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
|
|
|
|
|
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
|
|
|
|
|
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
|
|
|
|
|
udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
|
|
|
|
|
udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
|
|
|
|
|
udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
|
|
|
|
|
udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
|
|
|
|
|
udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
|
|
|
|
|
|
|
|
|
|
//更新产品信息表相关产品信息
|
|
|
|
|
UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
|
|
|
|
|
udiInfoRequest.setNameCode(udiRelevanceResponse.getNameCode());
|
|
|
|
|
udiInfoRequest.setSptm(udiRelevanceResponse.getSptm());
|
|
|
|
|
udiInfoRequest.setYbbm(udiRelevanceResponse.getYbbm());
|
|
|
|
|
udiInfoRequest.setMeasname(udiRelevanceResponse.getMeasname());
|
|
|
|
|
udiInfoRequest.setManufactory(udiRelevanceResponse.getManufactory());
|
|
|
|
|
udiInfoRequest.setCpms(udiRelevanceResponse.getCpms());
|
|
|
|
|
// udiInfoRequest.setDiType(udiRelevanceResponse.getDiType());
|
|
|
|
|
udiInfoRequest.setPrice(udiRelevanceResponse.getPrice());
|
|
|
|
|
udiInfoRequest.setSpmc(udiRelevanceResponse.getSpmc());
|
|
|
|
|
udiInfoRequest.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
|
|
|
|
|
udiInfoRequest.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
|
|
|
|
|
udiInfoRequest.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
|
|
|
|
|
udiInfoRequest.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
|
|
|
|
|
udiInfoRequest.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
|
|
|
|
|
if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
|
|
|
|
|
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
|
|
|
|
|
udiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
|
|
|
|
|
}
|
|
|
|
|
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
|
|
|
|
|
udiInfoService.updateUdiInfo(udiInfoEntity);
|
|
|
|
|
|
|
|
|
|
udiInfoRequest.setUuid(udiRelevanceResponse.getUuid());
|
|
|
|
|
udiInfoService.updateUdiInfo(udiInfoRequest);
|
|
|
|
|
return ResultVOUtils.success("更新成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -507,12 +514,12 @@ public class UdiRelevanceController {
|
|
|
|
|
String time = DateUtil.getDateTime();
|
|
|
|
|
udiRelevanceEntity.setUpdateTime(time);
|
|
|
|
|
udiRelevanceEntity.setModifyTime(time);
|
|
|
|
|
UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust();
|
|
|
|
|
udiInfoReqeust.setYbbm(postSmpUdiInfoRequest.getYbbm());
|
|
|
|
|
udiInfoReqeust.setSptm(postSmpUdiInfoRequest.getSptm());
|
|
|
|
|
BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoReqeust);
|
|
|
|
|
udiInfoReqeust.setUuid(udiRelevanceEntity.getUuid());
|
|
|
|
|
udiInfoService.insertUdiInfo(udiInfoReqeust);
|
|
|
|
|
UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
|
|
|
|
|
udiInfoRequest.setYbbm(postSmpUdiInfoRequest.getYbbm());
|
|
|
|
|
udiInfoRequest.setSptm(postSmpUdiInfoRequest.getSptm());
|
|
|
|
|
BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoRequest);
|
|
|
|
|
udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
|
|
|
|
|
udiInfoService.insertUdiInfo(udiInfoRequest);
|
|
|
|
|
udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
|
|
|
|
|
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
|
|
|
|
|
}
|
|
|
|
|
@ -691,7 +698,7 @@ public class UdiRelevanceController {
|
|
|
|
|
}
|
|
|
|
|
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
|
|
|
|
|
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
|
|
|
|
|
UdiInfoReqeust UdiInfoRequest = new UdiInfoReqeust();
|
|
|
|
|
UdiInfoRequest UdiInfoRequest = new UdiInfoRequest();
|
|
|
|
|
BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest);
|
|
|
|
|
UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
|
|
|
|
|
UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
|
|
|
|
|
|
anthonywj
2 years ago