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

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

@ -88,14 +88,14 @@ public class BasicProductCategoryController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if(StrUtil.isEmpty(basicProductTypeRequest.getName())){
if (StrUtil.isEmpty(basicProductTypeRequest.getName())) {
return ResultVOUtils.error(999, "名字不能为空！");
}
Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 1);
if(falg==false){
if (falg == false) {
return ResultVOUtils.error(999, "院内分类名字已存在！");
}
falg = basicProductCategoryService.saveBasicHospType(basicProductTypeRequest);
falg = basicProductCategoryService.saveBasicHospType(basicProductTypeRequest);
if (!falg) {
return ResultVOUtils.error(999, "插入失败！");
}
@ -110,16 +110,16 @@ public class BasicProductCategoryController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if(StrUtil.isEmpty(basicProductTypeRequest.getName())){
if (StrUtil.isEmpty(basicProductTypeRequest.getName())) {
return ResultVOUtils.error(999, "名字不能为空！");
}
if(basicProductTypeRequest.getCode().equals(basicProductTypeRequest.getParentCode())){
if (basicProductTypeRequest.getCode().equals(basicProductTypeRequest.getParentCode())) {
return ResultVOUtils.error(999, "上级菜单不能选择自己！");
}
Boolean falg = basicProductCategoryService.checkName(basicProductTypeRequest, 2);
if(falg==false){
if (falg == false) {
return ResultVOUtils.error(999, "院内分类名字已存在！");
}
falg = basicProductCategoryService.updateBasicHospType(basicProductTypeRequest);
@ -139,16 +139,16 @@ public class BasicProductCategoryController {
}
//先判断是否有下级 无下级在判断是否有产品
boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode());
if(b){
return ResultVOUtils.error(555,"此分类下还有子分类,不能删除!");
if (b) {
return ResultVOUtils.error(555, "此分类下还有子分类,不能删除!");
}
//判断此分类中是否有产品
boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode());
if(checkrel){
return ResultVOUtils.error(555,"此分类中绑定产品,不能删除!");
if (checkrel) {
return ResultVOUtils.error(555, "此分类中绑定产品,不能删除!");
}
String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest);
String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest);
if (StringUtils.isNotBlank(msg)) {
return ResultVOUtils.error(999, msg);
@ -201,7 +201,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setDiType(1);
}
List<UdiRelevanceResponse> list= basicProductCategoryService.selectAll(filterUdiProductRequest);
List<UdiRelevanceResponse> list = basicProductCategoryService.selectAll(filterUdiProductRequest);
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -216,9 +216,9 @@ public class BasicProductCategoryController {
BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
//过滤已被选入的产品
FilterUdiProductRequest request = new FilterUdiProductRequest();
if("10000".equals(category.getParentCode())) {
if ("10000".equals(category.getParentCode())) {
request.setCode(filterUdiRelRequest.getParentCode());
}else{
} else {
request.setCode(category.getCode());
}
List<UdiRelevanceResponse> udiRelevanceResponses1 = basicProductCategoryService.selectAll(request);
@ -227,35 +227,35 @@ public class BasicProductCategoryController {
list.add(udiRelevanceResponse.getId());
}
filterUdiRelRequest.setExistid(list);
List<UdiRelevanceResponse> udiRelevanceResponses=null;
List<UdiRelevanceResponse> udiRelevanceResponses = null;
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
if (udiEntity != null) {
filterUdiRelRequest.setNameCode(udiEntity.getUdi());
filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
}
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<UdiRelevanceResponse> temps = basicHospTypeService.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);
}
//如果输入DI标识，精确找到不同层级对应的产品信息
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
List<UdiRelevanceResponse> temps = basicHospTypeService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
filterUdiRelRequest.setUnionCode(null);
}
if("10000".equals(category.getParentCode())) {
} else {
//只查找主标识产品信息
filterUdiRelRequest.setDiType(1);
}
if ("10000".equals(category.getParentCode())) {
//查全部
udiRelevanceResponses= basicHospTypeService.filterUdiGpexist(filterUdiRelRequest);
udiRelevanceResponses = basicHospTypeService.filterUdiGpexist(filterUdiRelRequest);
}else{
} else {
// 查上级
FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest();
filterUdiProductRequest.setCode(category.getParentCode());
@ -266,7 +266,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
filterUdiProductRequest.setExistid(list);
udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest);
udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest);
}
@ -278,40 +278,39 @@ public class BasicProductCategoryController {
}
@GetMapping("/udiwms/basic/product/category/SelcetproductList")
public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses=null;
List<UdiRelevanceResponse> udiRelevanceResponses = null;
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
if (udiEntity != null) {
filterUdiRelRequest.setNameCode(udiEntity.getUdi());
filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
}
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<UdiRelevanceResponse> 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);
}
//如果输入DI标识，精确找到不同层级对应的产品信息
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
List<UdiRelevanceResponse> 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);
}
//是否是一级分类
BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
if("10000".equals(category.getParentCode())) {
if ("10000".equals(category.getParentCode())) {
//查全部
udiRelevanceResponses= basicHospTypeService.filterUdiGp(filterUdiRelRequest);
}else{
udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
} else {
// 查上级
FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest();
filterUdiProductRequest.setCode(category.getParentCode());
@ -322,7 +321,7 @@ public class BasicProductCategoryController {
filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest);
udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest);
}
//循环插入
@ -331,10 +330,10 @@ public class BasicProductCategoryController {
List<String> list = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) {
list.add(udiRelevanceRespons.getId()+"");
list.add(udiRelevanceRespons.getId() + "");
}
if(!(udiRelevanceResponses != null && udiRelevanceResponses.size()>0)){
return ResultVOUtils.error(456,"为查询到对应数据!");
if (!(udiRelevanceResponses != null && udiRelevanceResponses.size() > 0)) {
return ResultVOUtils.error(456, "为查询到对应数据!");
}
basicProductTypeRequest.setIds(list);
basicProductCategoryService.insertCateRel(basicProductTypeRequest);
@ -343,20 +342,13 @@ public class BasicProductCategoryController {
}
@GetMapping("/udiwms/basic/product/category/deleterel")
public BaseResponse deleterel(Integer id){
basicProductCategoryService.deleterelByid(id);
return ResultVOUtils.success();
public BaseResponse deleterel(Integer id) {
basicProductCategoryService.deleterelByid(id);
return ResultVOUtils.success();
}
@PostMapping("/udiwms/basic/product/category/unbindRel")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
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());
if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
udiProductEntity.setGgxh(thrProductsEntity.getSpec());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
@ -232,8 +232,6 @@ public class ThrProductsController {
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
udiProductEntity.setCpms(thrProductsEntity.getCpms());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity);
}

131
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 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 on basic_product_category_rel.code = basic_product_category.code
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="category != '' and category != null">
AND basic_product_category_rel.code = #{category}
AND basic_product_category.name = #{category}
</if>
<if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
@ -508,62 +509,62 @@
<select id="filterUdiGpexist" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
bht.name classifyName,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
bht.name classifyName,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -573,7 +574,7 @@
</if>
<if test="bindType != '' and bindType != null">
AND (relCode is null
or trim(relCode) = '')
or trim(relCode) = '')
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
@ -592,9 +593,9 @@
</if>
<if test="unionCode != '' and unionCode != null">
and (
nameCode LIKE concat('%', #{unionCode}, '%')
or ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
nameCode LIKE concat('%', #{unionCode}, '%')
or ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
@ -604,10 +605,10 @@
</if>
<if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
@ -626,7 +627,7 @@
</if>
<if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">

Write Preview
Loading…
Cancel
Save