diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java index 93c7f837..9f265603 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -8,6 +9,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; @@ -15,7 +17,9 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicHospTypeResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.BasicHospTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.StringUtils; +import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -32,15 +36,13 @@ public class BasicHospTypeController { BasicHospTypeService basicHospTypeService; - - @GetMapping("/udiwms/basic/hosp/type/filter") public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List basicHospTypeEntities=basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest); + List basicHospTypeEntities = basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest); PageInfo pageInfo = new PageInfo<>(basicHospTypeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -55,21 +57,21 @@ public class BasicHospTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List basicHospTypeEntities=basicHospTypeService.getMenuList(basicHospTypeFilterRequest); + List basicHospTypeEntities = basicHospTypeService.getMenuList(basicHospTypeFilterRequest); return ResultVOUtils.success(basicHospTypeEntities); } @PostMapping("/udiwms/basic/hosp/type/save") - public BaseResponse save(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { + public BaseResponse save(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Boolean falg=basicHospTypeService.saveBasicHospType(basicHospTypeRequest); - if(!falg){ - return ResultVOUtils.error(999,"插入失败！"); + Boolean falg = basicHospTypeService.saveBasicHospType(basicHospTypeRequest); + if (!falg) { + return ResultVOUtils.error(999, "插入失败！"); } return ResultVOUtils.success(); } @@ -77,15 +79,15 @@ public class BasicHospTypeController { @PostMapping("/udiwms/basic/hosp/type/update") @Log(title = "单据管理", businessType = BusinessType.UPDATE) - public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { + public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Boolean falg=basicHospTypeService.updateBasicHospType(basicHospTypeRequest); - if(!falg){ - return ResultVOUtils.error(999,"更新失败！"); + Boolean falg = basicHospTypeService.updateBasicHospType(basicHospTypeRequest); + if (!falg) { + return ResultVOUtils.error(999, "更新失败！"); } return ResultVOUtils.success(); } @@ -97,35 +99,58 @@ public class BasicHospTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - String msg=basicHospTypeService.delectBasicHospType(basicHospTypeRequest); + String msg = basicHospTypeService.delectBasicHospType(basicHospTypeRequest); - if (StringUtils.isNotBlank(msg)){ - return ResultVOUtils.error(999,msg); + if (StringUtils.isNotBlank(msg)) { + return ResultVOUtils.error(999, msg); } return ResultVOUtils.success(); } @GetMapping("/udiwms/basic/hosp/type/getTree") public BaseResponse getTree() { - List basicHospTypeEntities=basicHospTypeService.getTreeList(); + List basicHospTypeEntities = basicHospTypeService.getTreeList(); return ResultVOUtils.success(basicHospTypeEntities); } @PostMapping("/udiwms/basic/hosp/type/bindRel") - public BaseResponse saveRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { + public BaseResponse saveRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Boolean falg=basicHospTypeService.bindHospProduct(basicHospTypeRequest); + Boolean falg = basicHospTypeService.bindHospProduct(basicHospTypeRequest); return ResultVOUtils.success(); } + @Resource + UdiRelevanceService udiRelevanceService; + @GetMapping("/udiwms/basic/hosp/type/bindList") public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) { - filterUdiRelRequest.setDiType(1); + if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()); + if (udiEntity != null) { + filterUdiRelRequest.setNameCode(udiEntity.getUdi()); + filterUdiRelRequest.setUnionCode(udiEntity.getUdi()); + } + } + //如果输入DI标识，精确找到不同层级对应的产品信息 + if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) { + FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); + filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode()); + List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); + filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode()); + filterUdiRelRequest.setUnionCode(null); + } + } else { + //只查找主标识产品信息 + filterUdiRelRequest.setDiType(1); + } List udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest); PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -137,13 +162,13 @@ public class BasicHospTypeController { @PostMapping("/udiwms/basic/hosp/type/unbindRel") @Log(title = "单据管理", businessType = BusinessType.UPDATE) - public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { + public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Boolean falg=basicHospTypeService.unbindHospProduct(basicHospTypeRequest); + Boolean falg = basicHospTypeService.unbindHospProduct(basicHospTypeRequest); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 22627c6d..a10e444a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -681,7 +682,8 @@ public class UdiRelevanceController extends BaseController { if (udiProductEntity.getRelSupId() != null) { UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); udiRlSupEntity.setUpdateTime(new Date()); - udiRlSupEntity.setId(udiProductEntity.getId()); + udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice())); + udiRlSupEntity.setId(udiProductEntity.getRelSupId()); udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); } if (falg) { diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java index a2f8afa7..f4ed86b0 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java @@ -32,6 +32,10 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity { private String companyName; + /** + * 规格型号 + */ + private String standard; private String price; private String basicPrductRemak1; diff --git a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java index 60ad8209..f4f993f9 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java @@ -30,6 +30,8 @@ public interface UdiRlSupService { int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity); + int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity); + boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index 3a094437..b7b3128a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.entity.basic.UdiRlSupEntity; @@ -103,6 +104,13 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { return udiRlSupDao.updateById(udiRlSupEntity); } + @Override + public int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity) { + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("udiRlIdFk",companyCertEntity.getUdiRlIdFk()); + return udiRlSupDao.update(companyCertEntity,ew); + } + @Override public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) { return udiRlSupDao.insertCompanyProductRelevance(udiRlSupEntity); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index be32c993..4928d49f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -38,6 +38,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); } List thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest); + + if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) { + thrProductsAddDiResponses.forEach(thrProductsAddDiResponse -> { + thrProductsAddDiResponse.setStandard(thrProductsAddDiResponse.getSpec()); + thrProductsAddDiResponse.setZczbhhzbapzbh(thrProductsAddDiResponse.getRegisterNo()); + }); + } return thrProductsAddDiResponses; } @@ -84,10 +91,10 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { List list = new ArrayList<>(uuids.size()); Date date = new Date(); for (String uuid : uuids) { - ProductInfoEntity productInfoEntity=productInfoService.selectByUuid(uuid).get(0); + ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0); ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); - thrProductsAddDiEntity.setCustomerId(customerId+""); + thrProductsAddDiEntity.setCustomerId(customerId + ""); thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setType(1); thrProductsAddDiEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc()); @@ -103,6 +110,16 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { thrProductsAddDiEntity.setRegisterNo(productInfoEntity.getZczbhhzbapzbh()); thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc()); thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh()); + + //设置编辑区参数 + thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm()); + thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm()); + thrProductsAddDiEntity.setMeasname(thrDiProductsRequest.getMeasname()); + thrProductsAddDiEntity.setManufactory(thrDiProductsRequest.getManufactory()); + thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc()); + thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms()); + thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice()); + thrProductsAddDiEntity.setCreateTime(date); thrProductsAddDiEntity.setUpdateTime(new Date()); thrProductsAddDiEntity.setStatus(1); //未审核 @@ -114,13 +131,16 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { @Override public UdiInfoResponse getDiProductDetail(String uuid) { - ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiDao.filterThrProductsGetUuid(uuid); - UdiInfoResponse udiInfoResponse=thrProductsAddDiDao.getDiProductDetail(uuid); + ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid); + UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid); udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm()); udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm()); udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms()); - return udiInfoResponse; + udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname()); + udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); + udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice()); + return udiInfoResponse; } @Override diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8aa1a199..6d994440 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -407,6 +407,9 @@ and originUuid = #{originUuid} + + and manufactory LIKE concat('%',#{manufactory},'%') + ORDER BY modifyTime DESC diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index f8a89e87..8fe545e1 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -77,17 +77,63 @@ - SELECT tdi.*, bc.name companyName + SELECT tdi.*, + bc.name companyName FROM thr_products_add_di tdi - left join basic_corp bc on tdi.customerId = bc.erpId + left join basic_corp bc on tdi.customerId = bc.erpId AND tdi.status = #{checkStatus}