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

分类第三方产品信息问题

Browse Source
dev
anthonywj 2 years ago
parent 7af361a932
commit c1d4d1b1df
3 changed files with 135 additions and 144 deletions
Show Stats Download Patch File Download Diff File

60
src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java
Unescape Escape View File

@ -88,11 +88,11 @@ public class BasicProductCategoryController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
if(StrUtil.isEmpty(basicProductTypeRequest.getName())){ if (StrUtil.isEmpty(basicProductTypeRequest.getName())) {
return ResultVOUtils.error(999, "名字不能为空！"); return ResultVOUtils.error(999, "名字不能为空！");
} }
Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 1); Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 1);
if(falg==false){ if (falg == false) {
return ResultVOUtils.error(999, "院内分类名字已存在！"); return ResultVOUtils.error(999, "院内分类名字已存在！");
} }
falg = basicProductCategoryService.saveBasicHospType(basicProductTypeRequest); falg = basicProductCategoryService.saveBasicHospType(basicProductTypeRequest);
@ -110,16 +110,16 @@ public class BasicProductCategoryController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
if(StrUtil.isEmpty(basicProductTypeRequest.getName())){ if (StrUtil.isEmpty(basicProductTypeRequest.getName())) {
return ResultVOUtils.error(999, "名字不能为空！"); return ResultVOUtils.error(999, "名字不能为空！");
} }
if(basicProductTypeRequest.getCode().equals(basicProductTypeRequest.getParentCode())){ if (basicProductTypeRequest.getCode().equals(basicProductTypeRequest.getParentCode())) {
return ResultVOUtils.error(999, "上级菜单不能选择自己！"); return ResultVOUtils.error(999, "上级菜单不能选择自己！");
} }
Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 2); Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 2);
if(falg==false){ if (falg == false) {
return ResultVOUtils.error(999, "院内分类名字已存在！"); return ResultVOUtils.error(999, "院内分类名字已存在！");
} }
falg = basicProductCategoryService.updateBasicHospType(basicProductTypeRequest); falg = basicProductCategoryService.updateBasicHospType(basicProductTypeRequest);
@ -139,13 +139,13 @@ public class BasicProductCategoryController {
} }
//先判断是否有下级 无下级在判断是否有产品 //先判断是否有下级 无下级在判断是否有产品
boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode()); boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode());
if(b){ if (b) {
return ResultVOUtils.error(555,"此分类下还有子分类,不能删除!"); return ResultVOUtils.error(555, "此分类下还有子分类,不能删除!");
} }
//判断此分类中是否有产品 //判断此分类中是否有产品
boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode()); boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode());
if(checkrel){ if (checkrel) {
return ResultVOUtils.error(555,"此分类中绑定产品,不能删除!"); return ResultVOUtils.error(555, "此分类中绑定产品,不能删除!");
} }
String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest); String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest);
@ -201,7 +201,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setDiType(1); filterUdiProductRequest.setDiType(1);
} }
List<UdiRelevanceResponse> list= basicProductCategoryService.selectAll(filterUdiProductRequest); List<UdiRelevanceResponse> list = basicProductCategoryService.selectAll(filterUdiProductRequest);
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(list); PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -216,9 +216,9 @@ public class BasicProductCategoryController {
BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode()); BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
//过滤已被选入的产品 //过滤已被选入的产品
FilterUdiProductRequest request = new FilterUdiProductRequest(); FilterUdiProductRequest request = new FilterUdiProductRequest();
if("10000".equals(category.getParentCode())) { if ("10000".equals(category.getParentCode())) {
request.setCode(filterUdiRelRequest.getParentCode()); request.setCode(filterUdiRelRequest.getParentCode());
}else{ } else {
request.setCode(category.getCode()); request.setCode(category.getCode());
} }
List<UdiRelevanceResponse> udiRelevanceResponses1 = basicProductCategoryService.selectAll(request); List<UdiRelevanceResponse> udiRelevanceResponses1 = basicProductCategoryService.selectAll(request);
@ -227,7 +227,7 @@ public class BasicProductCategoryController {
list.add(udiRelevanceResponse.getId()); list.add(udiRelevanceResponse.getId());
} }
filterUdiRelRequest.setExistid(list); filterUdiRelRequest.setExistid(list);
List<UdiRelevanceResponse> udiRelevanceResponses=null; List<UdiRelevanceResponse> udiRelevanceResponses = null;
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) { if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
@ -251,11 +251,11 @@ public class BasicProductCategoryController {
//只查找主标识产品信息 //只查找主标识产品信息
filterUdiRelRequest.setDiType(1); filterUdiRelRequest.setDiType(1);
} }
if("10000".equals(category.getParentCode())) { if ("10000".equals(category.getParentCode())) {
//查全部 //查全部
udiRelevanceResponses= basicHospTypeService.filterUdiGpexist(filterUdiRelRequest); udiRelevanceResponses = basicHospTypeService.filterUdiGpexist(filterUdiRelRequest);
}else{ } else {
// 查上级 // 查上级
FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest(); FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest();
filterUdiProductRequest.setCode(category.getParentCode()); filterUdiProductRequest.setCode(category.getParentCode());
@ -266,7 +266,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId()); filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode()); filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
filterUdiProductRequest.setExistid(list); filterUdiProductRequest.setExistid(list);
udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest); udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest);
} }
@ -278,11 +278,10 @@ public class BasicProductCategoryController {
} }
@GetMapping("/udiwms/basic/product/category/SelcetproductList") @GetMapping("/udiwms/basic/product/category/SelcetproductList")
public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) { public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses=null; List<UdiRelevanceResponse> udiRelevanceResponses = null;
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) { if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
@ -308,10 +307,10 @@ public class BasicProductCategoryController {
} }
//是否是一级分类 //是否是一级分类
BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode()); BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
if("10000".equals(category.getParentCode())) { if ("10000".equals(category.getParentCode())) {
//查全部 //查全部
udiRelevanceResponses= basicHospTypeService.filterUdiGp(filterUdiRelRequest); udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
}else{ } else {
// 查上级 // 查上级
FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest(); FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest();
filterUdiProductRequest.setCode(category.getParentCode()); filterUdiProductRequest.setCode(category.getParentCode());
@ -322,7 +321,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId()); filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode()); filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest); udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest);
} }
//循环插入 //循环插入
@ -331,10 +330,10 @@ public class BasicProductCategoryController {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) { for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) {
list.add(udiRelevanceRespons.getId()+""); list.add(udiRelevanceRespons.getId() + "");
} }
if(!(udiRelevanceResponses != null && udiRelevanceResponses.size()>0)){ if (!(udiRelevanceResponses != null && udiRelevanceResponses.size() > 0)) {
return ResultVOUtils.error(456,"为查询到对应数据!"); return ResultVOUtils.error(456, "为查询到对应数据!");
} }
basicProductTypeRequest.setIds(list); basicProductTypeRequest.setIds(list);
basicProductCategoryService.insertCateRel(basicProductTypeRequest); basicProductCategoryService.insertCateRel(basicProductTypeRequest);
@ -343,20 +342,13 @@ public class BasicProductCategoryController {
} }
@GetMapping("/udiwms/basic/product/category/deleterel") @GetMapping("/udiwms/basic/product/category/deleterel")
public BaseResponse deleterel(Integer id){ public BaseResponse deleterel(Integer id) {
basicProductCategoryService.deleterelByid(id); basicProductCategoryService.deleterelByid(id);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@PostMapping("/udiwms/basic/product/category/unbindRel") @PostMapping("/udiwms/basic/product/category/unbindRel")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {

4
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -208,7 +208,7 @@ public class ThrProductsController {
udiProductEntity.setMeasname(thrProductsEntity.getMeasname()); udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
if (StrUtil.isNotEmpty(thrProductsEntity.getSpec())) if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
udiProductEntity.setGgxh(thrProductsEntity.getSpec()); udiProductEntity.setGgxh(thrProductsEntity.getSpec());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard()); udiProductEntity.setGgxh(thrProductsEntity.getStandard());
if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
@ -232,8 +232,6 @@ public class ThrProductsController {
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc()); udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(thrProductsEntity.getCpms())) if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
udiProductEntity.setCpms(thrProductsEntity.getCpms()); udiProductEntity.setCpms(thrProductsEntity.getCpms());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity); udiProductService.updateUdiInfo(udiProductEntity);
} }

3
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -198,12 +198,13 @@
left join basic_hosp_type bht on basic_udirel.relCode = bht.code left join basic_hosp_type bht on basic_udirel.relCode = bht.code
left join thr_products tp on tp.code = basic_udirel.mainId left join thr_products tp on tp.code = basic_udirel.mainId
left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id
left join basic_product_category on basic_product_category_rel.code = basic_product_category.code
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if> </if>
<if test="category != '' and category != null"> <if test="category != '' and category != null">
AND basic_product_category_rel.code = #{category} AND basic_product_category.name = #{category}
</if> </if>
<if test="manufactory != '' and manufactory != null"> <if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%') AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')

Write Preview
Loading…
Cancel
Save