From 0ea814178760df0b4eec4ad0f42419b116974a2b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 7 Apr 2023 16:24:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E5=AD=97=E6=AE=B5=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E7=89=A9=E8=B5=84=E5=85=A5?= =?UTF-8?q?=E9=99=A2=E5=AE=A1=E6=A0=B8=E4=BB=B7=E6=A0=BC=E7=AD=89=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9C=AA=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ThrProductsAddDiServiceImpl.java | 13 ++++ .../mybatis/mapper/purchase/SupProductDao.xml | 64 ++++++++++++++++--- 2 files changed, 68 insertions(+), 9 deletions(-) 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..8ff946db 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 @@ -103,6 +103,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); //未审核 @@ -120,6 +130,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm()); udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms()); + udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname()); + udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); + udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice()); return udiInfoResponse; } 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} From 441585878edfede9a5ea26abc3e935953995b39b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Apr 2023 17:50:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 +++ 1 file changed, 3 insertions(+) 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 From b0a09292e3cc933afa96d3e9611b2d1e6f2a4de5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 7 Apr 2023 17:59:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicHospTypeController.java | 67 +++++++++++++------ 1 file changed, 46 insertions(+), 21 deletions(-) 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(); }