From bd7fd9691ab290743404ddac3ec6791ad185143d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Apr 2023 14:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BF=81=E7=A7=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E5=BA=93=E5=90=8C=E6=AD=A5=E5=88=B0=E5=A4=96=E7=BD=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 57 +- .../basic/UdiRelevanceController.java | 111 ++- .../controller/basic/UdiRlSupController.java | 62 +- .../dao/basic/CompanyProductRelevanceDao.java | 15 +- .../com/glxp/api/dao/basic/UdiProductDao.java | 8 + .../glxp/api/dao/basic/UdiRelevanceDao.java | 18 + .../com/glxp/api/dao/basic/UdiRlSupDao.java | 8 + .../api/entity/basic/BasicProductsEntity.java | 16 +- .../api/entity/system/SysMenuHelpEntity.java | 2 +- .../SysPdfTemplateRelevanceBizEntity.java | 4 +- .../SysPdfTemplateRelevanceCodeEntity.java | 2 +- .../SysPdfTemplateRelevanceLabelEntity.java | 4 +- ...SysPdfTemplateRelevanceStatemenEntity.java | 4 +- .../basic/CompanyProductRelevanceRequest.java | 1 + .../api/req/system/SysMenuHelpRequest.java | 2 +- .../CompanyProductRelevanceResponse.java | 86 ++ .../basic/CompanyProductRelevanceService.java | 22 + .../basic/CompanyProductsRelService.java | 5 + .../api/service/basic/UdiProductService.java | 7 + .../service/basic/UdiRelevanceService.java | 26 +- .../api/service/basic/UdiRlSupService.java | 10 + .../CompanyProductRelevanceServiceImpl.java | 59 ++ .../basic/impl/UdiProductServiceImpl.java | 6 + .../basic/impl/UdiRelevanceServiceImpl.java | 70 +- .../basic/impl/UdiRlSupServiceImpl.java | 14 + .../basic/CompanyProductRelevanceDao.xml | 226 +++++ .../mybatis/mapper/basic/UdiProductDao.xml | 937 +++++++++++++----- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 455 +++++++-- .../mybatis/mapper/basic/UdiRlSupDao.xml | 262 ++--- 29 files changed, 1943 insertions(+), 556 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java create mode 100644 src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 7eb2225d..e47e57b4 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -4,12 +4,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.NmpaUdiClient; @@ -20,10 +24,8 @@ import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.ProductInfoService; -import com.glxp.api.service.basic.UdiContrastService; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; @@ -62,11 +64,13 @@ public class UdiContrastController { @Resource ThrDataService thrDataService; + /** * 耗材字典添加 */ @AuthRuleAnnotation("") @PostMapping("/udi/udirel/revleance") + @Log(title = "耗材字典", businessType = BusinessType.INSERT) public BaseResponse revleanceUdi(@RequestBody UdiCombineRequest udiCombineRequest) { List keys = udiCombineRequest.getKeys(); if (keys != null && keys.size() > 0) { @@ -120,6 +124,7 @@ public class UdiContrastController { */ @AuthRuleAnnotation("") @PostMapping("/udi/udirel/changeVersion") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse changeVersion(@RequestBody UdiCombineRequest udiCombineRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); if (udiContrastService.isExit(udiCombineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) { @@ -144,6 +149,7 @@ public class UdiContrastController { //更改关联第三方产品产品信息 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/modifyRel") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse modifyRel(@RequestBody UdiCombineRequest udiCombineRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); udiRelevanceEntity = setThird(udiCombineRequest, udiRelevanceEntity); @@ -162,7 +168,15 @@ public class UdiContrastController { } } - + //关联第三方产品信息若无值则由第三方产品信息带过来 + UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); + if (StrUtil.isEmpty(udiProductEntity.getManufactory())) { + udiProductEntity.setManufactory(udiCombineRequest.getManufactory()); + } + if (StrUtil.isEmpty(udiProductEntity.getMeasname())) { + udiProductEntity.setMeasname(udiCombineRequest.getMeasname()); + } + udiProductService.updateUdiInfo(udiProductEntity); return ResultVOUtils.success("更新成功"); } @@ -170,6 +184,7 @@ public class UdiContrastController { //解除绑定第三方产品信息 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/thirdSys/remove") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse removeThirdId(RemoveUdiRelRequest removeUdiRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeUdiRelRequest.getRelId()); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); @@ -212,8 +227,9 @@ public class UdiContrastController { //解除绑定DI器械信息 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/di/remove") - public BaseResponse removeDI(RemoveUdiRelRequest removeUdiRelRequest) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeUdiRelRequest.getRelId()); + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) + public BaseResponse removeDI(RemoveUdiRelRequest removeRelRequest) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { return ResultVOUtils.error(500, "未关联第三方产品ID，无法解除绑定！"); } @@ -228,26 +244,25 @@ public class UdiContrastController { } ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId()); - UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); - udiProductEntity.setNameCode(thrProductsEntity.getCode()); - udiProductEntity.setCpmctymc(thrProductsEntity.getName()); - udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); - udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); - udiProductEntity.setGgxh(thrProductsEntity.getSpec()); - udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); - udiProductEntity.setUuid(CustomUtil.getUUId()); - udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); - udiProductEntity.setDiType(1); - udiProductService.insertUdiInfo(udiProductEntity); - udiRelevanceEntity.setUuid(udiProductEntity.getUuid()); + UdiProductEntity UdiInfoRequest = new UdiProductEntity(); + BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); + UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); + UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); + UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory()); + UdiInfoRequest.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); + UdiInfoRequest.setGgxh(thrProductsEntity.getSpec()); + UdiInfoRequest.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + UdiInfoRequest.setUuid(CustomUtil.getUUId()); + UdiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + UdiInfoRequest.setDiType(1); + udiProductService.insertUdiInfo(UdiInfoRequest); + udiRelevanceEntity.setUuid(UdiInfoRequest.getUuid()); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); return ResultVOUtils.success("解除绑定成功！"); } - //获取DI版本号 @AuthRuleAnnotation("") @GetMapping("/udiwms/syncdi/version") 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 822c2a8e..8175aa35 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -4,12 +4,15 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; @@ -24,6 +27,9 @@ import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.*; +import com.glxp.api.service.inout.IoCodeService; +import com.glxp.api.service.inv.InvPreProductService; +import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; @@ -38,6 +44,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; @@ -126,7 +133,7 @@ public class UdiRelevanceController extends BaseController { } List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (temps != null && temps.size() > 0) { - filterUdiRelRequest.setUuid(temps.get(0).getUuid()); + filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); filterUdiRelRequest.setNameCode(null); } } else { @@ -155,7 +162,7 @@ public class UdiRelevanceController extends BaseController { filterUdiRelRequest.setNameCode(filterUdiRelRequest.getUnionCode()); List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (temps != null && temps.size() > 0) { - filterUdiRelRequest.setUuid(temps.get(0).getUuid()); + filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); filterUdiRelRequest.setNameCode(null); } } else { @@ -183,6 +190,19 @@ public class UdiRelevanceController extends BaseController { } + //资质证书选入产品列表 产品名称，生产企业过滤 + @AuthRuleAnnotation("") + @GetMapping("/udi/cert/filterUdi") + public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) { + List udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + /** * 耗材字典信息获取同一产品对应DI信息 */ @@ -214,6 +234,7 @@ public class UdiRelevanceController extends BaseController { //多选删除 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteAll") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -224,8 +245,14 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.success("删除成功"); } + @Resource + IoCodeService codeService; + @Resource + CompanyProductRelevanceService companyProductRelevanceService; + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteById") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -233,37 +260,15 @@ public class UdiRelevanceController extends BaseController { } String ids = deleteRequest.getId(); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(Long.parseLong(ids)); - //todo 单据未完成 -// if (udiRelevanceEntity != null && udiRelevanceEntity.getUuid() != null) { -// List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); -// if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { -// for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { -// List udiInfoEntities = udiInfoService.findByUuids(udiRelevanceEntity1.getUuid()); -// if (udiInfoEntities != null && udiInfoEntities.size() > 0) { -// for (int i = 0; i < udiInfoEntities.size(); i++) { -// List warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode()); -// if (warehouseEntityList != null && warehouseEntityList.size() > 0) { -// return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); -// } -// } -// } -// } -// WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); -// warehouseQueryRequest.setRelId(ids); -// if (StrUtil.isNotEmpty(ids)) { -// List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); -// if (CollUtil.isNotEmpty(warehouseEntityList)) { -// return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); -// } -// } -// } -// } -// -// CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(ids, null); -// if (companyProductRelevanceEntity != null) { -// return ResultVOUtils.error(500, "该产品已被已被供应商选入" + "不能删除!"); -// } -// + if (udiRelevanceEntity != null && udiRelevanceEntity.getUuid() != null) { + if (codeService.isExitByRelId(udiRelevanceEntity.getId() + "")) { + return ResultVOUtils.error(500, "该产品已关联单据，无法删除！"); + } + if (companyProductRelevanceService.isExitByRelId(udiRelevanceEntity.getId() + "")) { + return ResultVOUtils.error(500, "该产品已被已被供应商选入，无法删除！"); + } + } + udiRelevanceService.deleteById(ids); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); @@ -271,9 +276,6 @@ public class UdiRelevanceController extends BaseController { udiProductService.deleteByUuid(udiRelevanceEntity.getUuid()); } - //todo -// companyProductRelevanceService.deleteByRlId(ids);//删除供应商关联表产品信息 - return ResultVOUtils.success("删除成功"); } @@ -282,6 +284,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -340,6 +343,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update/di") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateSingel(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -370,6 +374,7 @@ public class UdiRelevanceController extends BaseController { //新增或修改关联 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/check/udi") + public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) { List keys = udiCombineRequest.getKeys(); @@ -395,20 +400,24 @@ public class UdiRelevanceController extends BaseController { } + @Resource + InvProductService invProductService; + @Resource + InvPreProductService invPreProductService; + //查询产品是否可以被禁用 todo 库存还未完成 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/disable") public BaseResponse disable(@RequestBody UdiCombineRequest udiCombineRequest) { -// InvProductEntity invProductEntity = invProductService.selectExit(combineRequest.getRelId()); -// if (invProductEntity != null) { -// return ResultVOUtils.error(500, "库存已存在，无法禁用"); -// } -// -// InvProductEntity invPreProductEntity = invPreProductService.selectExit(combineRequest.getRelId()); -// if (invPreProductEntity != null) { -// return ResultVOUtils.error(500, "库存已存在，无法禁用"); -// } + + if (invProductService.isExitByRelId(udiCombineRequest.getRelId() + "")) { + return ResultVOUtils.error(500, "库存已存在，无法禁用"); + } + + if (invPreProductService.isExitByRelId(udiCombineRequest.getRelId() + "")) { + return ResultVOUtils.error(500, "寄售库存已存在，无法禁用"); + } return ResultVOUtils.success("更新成功"); } @@ -430,6 +439,7 @@ public class UdiRelevanceController extends BaseController { //单独选入ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addErp") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addErp(@RequestBody UdiCombineRequest udiCombineRequest) { String errMsg = null; @@ -447,6 +457,7 @@ public class UdiRelevanceController extends BaseController { //一键选入ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addAllErp") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addAllErp(@RequestBody UdiCombineRequest udiCombineRequest) { if (udiCombineRequest.getIsRlInv() != null && udiCombineRequest.getIsRlInv()) { @@ -626,6 +637,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/udirl/lock/status") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) { if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) { for (Long id : lockUdiRequest.getIds()) { @@ -643,13 +655,20 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateById") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - boolean falg = udiProductService.updateUdiInfoById(udiProductEntity); + if (udiProductEntity.getRelSupId() != null) { + UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); + udiRlSupEntity.setUpdateTime(new Date()); + udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice())); + udiRlSupEntity.setId(udiProductEntity.getRelSupId()); + udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); + } if (falg) { return ResultVOUtils.success("更新成功"); } else { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index ba32e061..2f89ee14 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -4,13 +4,15 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiRlSupEntity; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; @@ -19,14 +21,14 @@ import com.glxp.api.req.basic.UdiInfoExportRequest; import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.req.system.DeleteCompanyFileRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.basic.UdiRlSupService; -import com.glxp.api.service.basic.CompanyProductsRelService; -import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.udi.FilterUdiUtils; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -45,7 +47,7 @@ import java.util.List; * 供应商关联耗材字典信息 */ @RestController -public class UdiRlSupController { +public class UdiRlSupController extends BaseController { @Resource private AuthAdminService authAdminService; @Resource @@ -57,6 +59,12 @@ public class UdiRlSupController { @Resource private UdiRelevanceService udiRelevanceService; + @Resource + private CompanyService companyService; + @Resource + private CompanyProductRelevanceService companyProductRelevanceService; + @Resource + private UdiProductService udiProductService; @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") @@ -65,6 +73,12 @@ public class UdiRlSupController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getCustomerId())) { + String customerId = getCustomerId(); + if (customerId.equals("110")) { + companyProductRelevanceRequest.setCustomerId(null); + } + } companyProductRelevanceRequest.setIsDisable(false); if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) { @@ -80,7 +94,7 @@ public class UdiRlSupController { filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode()); List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); if (temps != null && temps.size() > 0) { - companyProductRelevanceRequest.setUuid(temps.get(0).getUuid()); + companyProductRelevanceRequest.setOriginUuid(temps.get(0).getOriginUuid()); companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode()); companyProductRelevanceRequest.setUnionCode(null); } @@ -177,6 +191,7 @@ public class UdiRlSupController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyProductRelevance") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { if (udiRlSupService.findCompanyProductRelevanceByProductUuid(udiRlSupEntity) != null) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT); @@ -191,25 +206,37 @@ public class UdiRlSupController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertFilter") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { if (StrUtil.isEmpty(udiInfoExportRequest.getUnitFk())) { return ResultVOUtils.error(500, "未选择供应商！"); } - //先判断产品是否存在 - CompanyProductRelevanceRequest filterUdiInfoRequest = new CompanyProductRelevanceRequest(); - filterUdiInfoRequest.setNameCode(udiInfoExportRequest.getNameCode()); - filterUdiInfoRequest.setCustomerId(udiInfoExportRequest.getUnitFk()); - List udiRlSupResponses = udiRlSupService.filterUdiGp(filterUdiInfoRequest); - if (udiRlSupResponses.size() != 0) { - return ResultVOUtils.error(999, "产品已存在，请勿重复导入！"); + //查询本企业有没有选择该产品有选择不能选择 + CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); + companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + ""); + List basicInstrumentMaintainRelevanceResponses = null; + companyProductRelevanceRequest.setDiType(1); + basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); + String rlidStr = udiInfoExportRequest.getRlIds().get(0); + for (CompanyProductRelevanceResponse obj : basicInstrumentMaintainRelevanceResponses) { + String rlid = String.valueOf(obj.getRlId()); + if (rlid.equals(rlidStr)) { + return ResultVOUtils.error(999, "该企业已选择该产品，请勿重复选择！"); + } } companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); - return ResultVOUtils.success("后台正在导入，请稍后刷新查看！"); + + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setId(Long.parseLong(rlidStr)); + udiRelevanceEntity.setLockStatus(1); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + return ResultVOUtils.success("选入成功！"); } @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyProductRelevance") + @Log(title = "供应商字典管理", businessType = BusinessType.UPDATE) public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { udiRlSupEntity.setUpdateTime(new Date()); int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); @@ -217,6 +244,7 @@ public class UdiRlSupController { } @PostMapping("/sale/info/deleteCompanyProductRelevance") + @Log(title = "供应商字典管理", businessType = BusinessType.DELETE) public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId()); return ResultVOUtils.success("成功"); diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index b8bc5a16..091c4dea 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -3,8 +3,21 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper -public interface CompanyProductRelevanceDao extends BaseMapperPlus { +public interface CompanyProductRelevanceDao extends BaseMapperPlus { + List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); + + boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean importCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity); + + boolean deleteById(String id); + + boolean deleteByRlId(String id); } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index c7b9ed49..cca4b942 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -76,4 +76,12 @@ public interface UdiProductDao { List selectGgxhList(@Param("relId") String relId); boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest); + + /** + * 根据DI查询此产品是否允许无批次号参数 + * + * @param nameCode + * @return + */ + UdiProductEntity selectAllowNoBatch(@Param("nameCode") String nameCode); } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 12da85e2..57627010 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -17,6 +17,8 @@ public interface UdiRelevanceDao extends BaseMapperPlus filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); + List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest); + List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest); @@ -101,4 +103,20 @@ public interface UdiRelevanceDao extends BaseMapperPlus selectUnitFkByRelId(@Param("relId") Long relId); + + /** + * 统计供应商配送产品数量 + * + * @param companyProductRelevanceRequest + * @return + */ + Long selectSupRlCount(CompanyProductRelevanceRequest companyProductRelevanceRequest); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 965edb9b..f0923ed8 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -69,8 +69,8 @@ public class BasicProductsEntity { private Integer bhzxxsbzsl; /** - * 最小包装单元内包含使用单元数量: -最小销售标识包含使用单元数量 + * 最小包装单元内包含使用单元数量: + * 最小销售标识包含使用单元数量 */ @TableField(value = "zxxsbzbhsydysl") private Integer zxxsbzbhsydysl; @@ -163,7 +163,7 @@ public class BasicProductsEntity { * 表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识 */ @TableField(value = "diType") - private Byte diType; + private Integer diType; /** * 医保编码 @@ -193,7 +193,7 @@ public class BasicProductsEntity { * 0:UDI，1：第三方产品编码 */ @TableField(value = "productType") - private Byte productType; + private Integer productType; /** * 是否包含批号 @@ -229,19 +229,19 @@ public class BasicProductsEntity { * 是否允许无批次号扫码 */ @TableField(value = "allowNoBatch") - private Byte allowNoBatch; + private Boolean allowNoBatch; /** * 是否允许无生产日期扫码 */ @TableField(value = "allowNoExpire") - private Byte allowNoExpire; + private Boolean allowNoExpire; /** * 是否允许无失效日期扫码 */ @TableField(value = "allowNoProduct") - private Byte allowNoProduct; + private Boolean allowNoProduct; /** * 商品名称 @@ -461,4 +461,4 @@ public class BasicProductsEntity { public static final String COL_UPDATEUSER = "updateUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java index 4abefe05..26f9b24d 100644 --- a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java @@ -19,7 +19,7 @@ public class SysMenuHelpEntity { private String menuName; @TableField(value = "`status`") - private Byte status; + private Integer status; @TableField(value = "filePath") private String filePath; diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java index f60a5cb4..e2b049c6 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java @@ -57,7 +57,7 @@ public class SysPdfTemplateRelevanceBizEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @@ -65,4 +65,4 @@ public class SysPdfTemplateRelevanceBizEntity { @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java index 69fb3732..9111da51 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java @@ -58,7 +58,7 @@ public class SysPdfTemplateRelevanceCodeEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java index 4026052f..32cf1478 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java @@ -57,11 +57,11 @@ public class SysPdfTemplateRelevanceLabelEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java index aa7436ba..d80e9b48 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java @@ -60,11 +60,11 @@ public class SysPdfTemplateRelevanceStatemenEntity { * 打印方式：0：批次号打印，1：条码清单打印 */ @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 4e38ef61..c86834d3 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -11,6 +11,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String cpmctymc; private String nameCode; private String uuid; + private String originUuid; private String ggxh; private String thirdId; private String id; diff --git a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java index d6c6409b..ce651c58 100644 --- a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java @@ -19,7 +19,7 @@ public class SysMenuHelpRequest extends ListPageRequest { private String menuName; - private Byte status; + private Integer status; private String filePath; diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java new file mode 100644 index 00000000..c123629d --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -0,0 +1,86 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +@Data +public class CompanyProductRelevanceResponse { + + private int id; + private Integer rlId; + private String thirdId; + private String thirdName; + private String uuid; + private String originUuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private String ybbm; + private String sptm; + private String manufactory; + private String measname; + private Boolean isDisable; + private long customerId; + + private String auditStatus; + private Boolean isLock; + private Integer lockStatus; + private String companyName; + private String mainId; + private String mainName; + private Boolean isAdavence; + + private String scbssfbhph; + private String scbssfbhxlh; + private String scbssfbhscrq; + private String scbssfbhsxrq; + private String cpms; + private String supName; + private boolean allowNoBatch; + private boolean allowNoExpire; + private boolean allowNoProduct; + private boolean allowNoSerial; + private String spmc; + private Integer productType; + private String price; + + //产品代理商 + private String cpdls; + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; +} diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java new file mode 100644 index 00000000..ce04e363 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.basic; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.res.basic.CompanyProductRelevanceResponse; + +import java.util.List; + +public interface CompanyProductRelevanceService extends IService { + + List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); + + boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean deleteById(String id); + + boolean deleteByRlId(String id); + + boolean isExitByRelId(String relId); +} diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index 4182eae3..4feabb70 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -1,12 +1,17 @@ package com.glxp.api.service.basic; +import cn.hutool.core.util.StrUtil; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.UdiInfoExportRequest; +import com.glxp.api.req.basic.UdiInfoRequest; +import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 446c3159..ee4ecdc9 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -53,4 +53,11 @@ public interface UdiProductService { boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest); + /** + * 根据DI查询此产品是否允许无批次号 + * + * @param nameCode + * @return + */ + UdiProductEntity getAllowNoBatch(String nameCode); } diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index 808f2baf..b89b809b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -1,27 +1,35 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; /** * 耗材字典关联 */ -public interface UdiRelevanceService { +public interface UdiRelevanceService extends IService { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); + List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest); + List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); List filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest); UdiRelevanceResponse selectByNameCode(String nameCode); - UdiRelevanceResponse selectSupGroupById(Long id); + /** + * 根据耗材字典ID查询耗材相关数据 + * + * @param relId + * @return + */ + UdiRelevanceResponse selectByRelId(String relId); //根据DI查询产品信息 List selectAllByNameCode(String nameCode); @@ -45,6 +53,10 @@ public interface UdiRelevanceService { UdiRelevanceResponse selectGroupById(Long id); + UdiRelevanceResponse selectUdiId(Long id); + + UdiRelevanceResponse selectSupGroupById(Long id); + UdiRelevanceEntity selectUpdateByUuid(String uuid); UdiRelevanceEntity selectUpdateByThirdId(String thirdId); @@ -81,4 +93,12 @@ public interface UdiRelevanceService { List selectGroupByNameCode(String nameCode, Boolean isDisable); + + /** + * 根据UDI码查询耗材字典ID + * + * @param code + * @return + */ + String getRelIdByUdiCode(String code); } 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..f13fabdd 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java @@ -30,9 +30,19 @@ public interface UdiRlSupService { int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity); + int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity); + boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); boolean deleteById(String id); boolean deleteByRlId(String id); + + /** + * 查询供应商是否存在此配送产品 + * + * @param companyProductRelevanceRequest + * @return + */ + boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java new file mode 100644 index 00000000..e5a3192d --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.service.basic.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.CompanyProductRelevanceDao; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.res.basic.CompanyProductRelevanceResponse; +import com.glxp.api.service.basic.CompanyProductRelevanceService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class CompanyProductRelevanceServiceImpl extends ServiceImpl + implements CompanyProductRelevanceService { + @Resource + CompanyProductRelevanceDao companyProductRelevanceDao; + + @Override + public List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest) { + if (basicInstrumentMaintainRequest == null) { + return Collections.emptyList(); + } + if (basicInstrumentMaintainRequest.getPage() != null) { + int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit(); + PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit()); + } + + List data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest); + return data; + } + + @Override + public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) { + return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity); + } + + @Override + public boolean deleteById(String id) { + return companyProductRelevanceDao.deleteById(id); + } + + @Override + public boolean deleteByRlId(String id) { + return companyProductRelevanceDao.deleteByRlId(id); + } + + @Override + public boolean isExitByRelId(String relId) { + return companyProductRelevanceDao.exists(new QueryWrapper().eq("udiRlIdFk", relId)); + } +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 636fe63c..4ce4dca3 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -145,4 +145,10 @@ public class UdiProductServiceImpl implements UdiProductService { return false; return udiProductDao.updateUdiInfoNotAll(udiInfoRequest); } + + @Override + public UdiProductEntity getAllowNoBatch(String nameCode) { + String di = FilterUdiUtils.getDiStr(nameCode); + return udiProductDao.selectAllowNoBatch(di); + } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 6618ff19..6f571bf0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -2,28 +2,28 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class UdiRelevanceServiceImpl implements UdiRelevanceService { +public class UdiRelevanceServiceImpl extends ServiceImpl implements UdiRelevanceService { @Resource UdiRelevanceDao udiRelevanceDao; @Resource @@ -42,6 +42,22 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return data; } + @Override + public List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) { + + + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + List data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest); + return data; + + } + @Override public List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) { if (filterUdiRelRequest == null) { @@ -72,23 +88,23 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } @Override - public UdiRelevanceResponse selectSupGroupById(Long id) { + public UdiRelevanceResponse selectByNameCode(String nameCode) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setId(id); - filterUdiRelRequest.setDiType(1); - List data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); + filterUdiRelRequest.setUniqueNameCode(nameCode); + List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) + return udiRelevanceResponses.get(0); return null; } @Override - public UdiRelevanceResponse selectByNameCode(String nameCode) { + public UdiRelevanceResponse selectByRelId(String relId) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setUniqueNameCode(nameCode); + filterUdiRelRequest.setRelId(relId); List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); - if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) + if (CollUtil.isNotEmpty(udiRelevanceResponses)) { return udiRelevanceResponses.get(0); + } return null; } @@ -181,6 +197,25 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return null; } + @Override + public UdiRelevanceResponse selectUdiId(Long id) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(id); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + @Override + public UdiRelevanceResponse selectSupGroupById(Long id) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(id); + filterUdiRelRequest.setDiType(1); + return udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest); + } + + @Override public UdiRelevanceEntity selectUpdateByUuid(String uuid) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); @@ -356,4 +391,13 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { public List selectGroupByNameCode(String nameCode, Boolean isDisable) { return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); } + + @Override + public String getRelIdByUdiCode(String code) { + if (StrUtil.isBlank(code)) { + return null; + } + UdiEntity udi = FilterUdiUtils.getUdi(code); + return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi()); + } } 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..76be752c 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); @@ -117,4 +125,10 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { public boolean deleteByRlId(String id) { return udiRlSupDao.deleteByRlId(id); } + + @Override + public boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest) { + Long count = udiRlSupDao.selectSupRlCount(companyProductRelevanceRequest); + return null != count && count != 0; + } } diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml new file mode 100644 index 00000000..8004250e --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -0,0 +1,226 @@ + + + + + + replace + INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, + price) + values (#{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{createTime}, + #{updateTime}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, #{price}) + + + + + replace + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, + create_time, update_time, auditStatus, productUuid, udiRlIdFk, unitFk, + price) + values (#{id}, + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, #{price}) + + + + DELETE + FROM company_product_relevance + WHERE id = #{id} + + + + + DELETE + FROM company_product_relevance + WHERE udiRlIdFk = #{id} + + + + diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 4421c271..18bd0d96 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -2,19 +2,19 @@ - @@ -99,14 +136,16 @@ resultType="com.glxp.api.entity.basic.UdiProductEntity"> SELECT * FROM basic_products - WHERE (id = #{id}) limit 1 + WHERE (id = #{id}) + limit 1 replace INTO basic_products - (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, - ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire, - allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8) - values - ( - #{uuid}, + (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) + values (#{uuid}, #{originUuid}, #{nameCode}, #{deviceRecordKey}, @@ -167,7 +210,7 @@ #{cpms}, #{allowNoBatch}, #{allowNoExpire}, - #{allowNoProduct}, + #{allowNoProduct}, #{allowNoSerial}, #{spmc}, #{cplx}, #{hchzsb}, @@ -180,21 +223,24 @@ #{basicPrductRemak5}, #{basicPrductRemak6}, #{basicPrductRemak7}, - #{basicPrductRemak8} - ) + #{basicPrductRemak8}) replace INTO basic_products - (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm, - ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire, - allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8) + (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) values - ( - #{item.uuid}, + (#{item.uuid}, #{item.originUuid}, #{item.nameCode}, #{item.deviceRecordKey}, @@ -231,7 +277,7 @@ #{item.cpms}, #{item.allowNoBatch}, #{item.allowNoExpire}, - #{item.allowNoProduct}, + #{item.allowNoProduct}, #{item.allowNoSerial}, #{item.spmc}, #{item.cplx}, #{item.hchzsb}, @@ -244,8 +290,7 @@ #{item.basicPrductRemak5}, #{item.basicPrductRemak6}, #{item.basicPrductRemak7}, - #{item.basicPrductRemak8} - ) + #{item.basicPrductRemak8}) @@ -264,116 +309,322 @@ UPDATE basic_products - originUuid=#{originUuid}, - nameCode=#{nameCode}, - deviceRecordKey=#{deviceRecordKey}, - packRatio=#{packRatio}, - packLevel=#{packLevel}, - packUnit=#{packUnit}, - bhxjsl=#{bhxjsl}, - bhzxxsbzsl=#{bhzxxsbzsl}, - zxxsbzbhsydysl=#{zxxsbzbhsydysl}, - bhxjcpbm=#{bhxjcpbm}, - bzcj=#{bzcj}, - cpmctymc=#{cpmctymc}, - cplb=#{cplb}, - flbm=#{flbm}, - ggxh=#{ggxh}, - qxlb=#{qxlb}, - tyshxydm=#{tyshxydm}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - sydycpbs=#{sydycpbs}, - sjcpbm=#{sjcpbm}, - versionNumber=#{versionNumber}, - diType=#{diType}, - ybbm=#{ybbm}, - sptm=#{sptm}, - manufactory=#{manufactory}, - measname=#{measname}, - productType=#{productType}, - scbssfbhph=#{scbssfbhph}, - scbssfbhxlh=#{scbssfbhxlh}, - scbssfbhscrq=#{scbssfbhscrq}, - scbssfbhsxrq=#{scbssfbhsxrq}, - cpms=#{cpms}, - allowNoBatch=#{allowNoBatch}, - allowNoExpire=#{allowNoExpire}, - allowNoProduct=#{allowNoProduct}, + + originUuid=#{originUuid}, + + + nameCode=#{nameCode}, + + + deviceRecordKey=#{deviceRecordKey}, + + + packRatio=#{packRatio}, + + + packLevel=#{packLevel}, + + + packUnit=#{packUnit}, + + + bhxjsl=#{bhxjsl}, + + + bhzxxsbzsl=#{bhzxxsbzsl}, + + + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + + + bhxjcpbm=#{bhxjcpbm}, + + + bzcj=#{bzcj}, + + + cpmctymc=#{cpmctymc}, + + + cplb=#{cplb}, + + + flbm=#{flbm}, + + + ggxh=#{ggxh}, + + + qxlb=#{qxlb}, + + + tyshxydm=#{tyshxydm}, + + + ylqxzcrbarmc=#{ylqxzcrbarmc}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + + + sydycpbs=#{sydycpbs}, + + + sjcpbm=#{sjcpbm}, + + + versionNumber=#{versionNumber}, + + + diType=#{diType}, + + + ybbm=#{ybbm}, + + + sptm=#{sptm}, + + + manufactory=#{manufactory}, + + + measname=#{measname}, + + + productType=#{productType}, + + + scbssfbhph=#{scbssfbhph}, + + + scbssfbhxlh=#{scbssfbhxlh}, + + + scbssfbhscrq=#{scbssfbhscrq}, + + + scbssfbhsxrq=#{scbssfbhsxrq}, + + + cpms=#{cpms}, + + + allowNoBatch=#{allowNoBatch}, + + + allowNoExpire=#{allowNoExpire}, + + + allowNoProduct=#{allowNoProduct}, + allowNoSerial=#{allowNoSerial}, - spmc=#{spmc}, - cplx=#{cplx}, - hchzsb=#{hchzsb}, - cpdls=#{cpdls}, - price=#{price}, - basicPrductRemak1=#{basicPrductRemak1}, - basicPrductRemak2=#{basicPrductRemak2}, - basicPrductRemak3=#{basicPrductRemak3}, - basicPrductRemak4=#{basicPrductRemak4}, - basicPrductRemak5=#{basicPrductRemak5}, - basicPrductRemak6=#{basicPrductRemak6}, - basicPrductRemak7=#{basicPrductRemak7}, - basicPrductRemak8=#{basicPrductRemak8}, + + + + spmc=#{spmc}, + + + cplx=#{cplx}, + + + hchzsb=#{hchzsb}, + + + cpdls=#{cpdls}, + + + price=#{price}, + + + basicPrductRemak1=#{basicPrductRemak1}, + + + basicPrductRemak2=#{basicPrductRemak2}, + + + basicPrductRemak3=#{basicPrductRemak3}, + + + basicPrductRemak4=#{basicPrductRemak4}, + + + basicPrductRemak5=#{basicPrductRemak5}, + + + basicPrductRemak6=#{basicPrductRemak6}, + + + basicPrductRemak7=#{basicPrductRemak7}, + + + basicPrductRemak8=#{basicPrductRemak8}, + - WHERE nameCode = #{nameCode} and uuid = #{uuid} + WHERE nameCode = #{nameCode} + and uuid = #{uuid} update basic_products - originUuid=#{originUuid}, - nameCode=#{nameCode}, - deviceRecordKey=#{deviceRecordKey}, - packRatio=#{packRatio}, - packLevel=#{packLevel}, - packUnit=#{packUnit}, - bhxjsl=#{bhxjsl}, - bhzxxsbzsl=#{bhzxxsbzsl}, - zxxsbzbhsydysl=#{zxxsbzbhsydysl}, - bhxjcpbm=#{bhxjcpbm}, - bzcj=#{bzcj}, - cpmctymc=#{cpmctymc}, - cplb=#{cplb}, - flbm=#{flbm}, - ggxh=#{ggxh}, - qxlb !==#{qxlb !=}, - tyshxydm=#{tyshxydm}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - sydycpbs=#{sydycpbs}, - sjcpbm=#{sjcpbm}, - versionNumber=#{versionNumber}, - diType=#{diType}, - ybbm=#{ybbm}, - sptm=#{sptm}, - manufactory=#{manufactory}, - measname=#{measname}, - productType=#{productType}, - scbssfbhph=#{scbssfbhph}, - scbssfbhxlh=#{scbssfbhxlh}, - scbssfbhscrq=#{scbssfbhscrq}, - scbssfbhsxrq=#{scbssfbhsxrq}, - cpms=#{cpms}, - allowNoBatch=#{allowNoBatch}, - allowNoExpire=#{allowNoExpire}, - allowNoProduct=#{allowNoProduct}, - spmc=#{spmc}, - cplx=#{cplx}, - hchzsb=#{hchzsb}, - cpdls=#{cpdls}, - price=#{price}, - basicPrductRemak1=#{basicPrductRemak1}, - basicPrductRemak2=#{basicPrductRemak2}, - basicPrductRemak3=#{basicPrductRemak3}, - basicPrductRemak4=#{basicPrductRemak4}, - basicPrductRemak5=#{basicPrductRemak5}, - basicPrductRemak6=#{basicPrductRemak6}, - basicPrductRemak7=#{basicPrductRemak7}, - basicPrductRemak8=#{basicPrductRemak8}, + + originUuid=#{originUuid}, + + + nameCode=#{nameCode}, + + + deviceRecordKey=#{deviceRecordKey}, + + + packRatio=#{packRatio}, + + + packLevel=#{packLevel}, + + + packUnit=#{packUnit}, + + + bhxjsl=#{bhxjsl}, + + + bhzxxsbzsl=#{bhzxxsbzsl}, + + + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + + + bhxjcpbm=#{bhxjcpbm}, + + + bzcj=#{bzcj}, + + + cpmctymc=#{cpmctymc}, + + + cplb=#{cplb}, + + + flbm=#{flbm}, + + + ggxh=#{ggxh}, + + + qxlb =#{qxlb}, + + + tyshxydm=#{tyshxydm}, + + + ylqxzcrbarmc=#{ylqxzcrbarmc}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + + + sydycpbs=#{sydycpbs}, + + + sjcpbm=#{sjcpbm}, + + + versionNumber=#{versionNumber}, + + + diType=#{diType}, + + + ybbm=#{ybbm}, + + + sptm=#{sptm}, + + + manufactory=#{manufactory}, + + + measname=#{measname}, + + + productType=#{productType}, + + + scbssfbhph=#{scbssfbhph}, + + + scbssfbhxlh=#{scbssfbhxlh}, + + + scbssfbhscrq=#{scbssfbhscrq}, + + + scbssfbhsxrq=#{scbssfbhsxrq}, + + + cpms=#{cpms}, + + + allowNoBatch=#{allowNoBatch}, + + + allowNoExpire=#{allowNoExpire}, + + + allowNoProduct=#{allowNoProduct}, + + + allowNoSerial=#{allowNoSerial}, + + + spmc=#{spmc}, + + + cplx=#{cplx}, + + + hchzsb=#{hchzsb}, + + + cpdls=#{cpdls}, + + + price=#{price}, + + + basicPrductRemak1=#{basicPrductRemak1}, + + + basicPrductRemak2=#{basicPrductRemak2}, + + + basicPrductRemak3=#{basicPrductRemak3}, + + + basicPrductRemak4=#{basicPrductRemak4}, + + + basicPrductRemak5=#{basicPrductRemak5}, + + + basicPrductRemak6=#{basicPrductRemak6}, + + + basicPrductRemak7=#{basicPrductRemak7}, + + + basicPrductRemak8=#{basicPrductRemak8}, + where uuid = #{uuid} @@ -381,56 +632,159 @@ update basic_products - originUuid=#{originUuid}, - nameCode=#{nameCode}, - deviceRecordKey=#{deviceRecordKey}, - packRatio=#{packRatio}, - packLevel=#{packLevel}, - packUnit=#{packUnit}, - bhxjsl=#{bhxjsl}, - bhzxxsbzsl=#{bhzxxsbzsl}, - zxxsbzbhsydysl=#{zxxsbzbhsydysl}, - bhxjcpbm=#{bhxjcpbm}, - bzcj=#{bzcj}, - cpmctymc=#{cpmctymc}, - cplb=#{cplb}, - flbm=#{flbm}, - ggxh=#{ggxh}, - qxlb !==#{qxlb !=}, - tyshxydm=#{tyshxydm}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - sydycpbs=#{sydycpbs}, - sjcpbm=#{sjcpbm}, - versionNumber=#{versionNumber}, - diType=#{diType}, - ybbm=#{ybbm}, - sptm=#{sptm}, - manufactory=#{manufactory}, - measname=#{measname}, - productType=#{productType}, - scbssfbhph=#{scbssfbhph}, - scbssfbhxlh=#{scbssfbhxlh}, - scbssfbhscrq=#{scbssfbhscrq}, - scbssfbhsxrq=#{scbssfbhsxrq}, - cpms=#{cpms}, - allowNoBatch=#{allowNoBatch}, - allowNoExpire=#{allowNoExpire}, - allowNoProduct=#{allowNoProduct}, - spmc=#{spmc}, - cplx=#{cplx}, - hchzsb=#{hchzsb}, - cpdls=#{cpdls}, - price=#{price}, - basicPrductRemak1=#{basicPrductRemak1}, - basicPrductRemak2=#{basicPrductRemak2}, - basicPrductRemak3=#{basicPrductRemak3}, - basicPrductRemak4=#{basicPrductRemak4}, - basicPrductRemak5=#{basicPrductRemak5}, - basicPrductRemak6=#{basicPrductRemak6}, - basicPrductRemak7=#{basicPrductRemak7}, - basicPrductRemak8=#{basicPrductRemak8}, + + originUuid=#{originUuid}, + + + nameCode=#{nameCode}, + + + deviceRecordKey=#{deviceRecordKey}, + + + packRatio=#{packRatio}, + + + packLevel=#{packLevel}, + + + packUnit=#{packUnit}, + + + bhxjsl=#{bhxjsl}, + + + bhzxxsbzsl=#{bhzxxsbzsl}, + + + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + + + bhxjcpbm=#{bhxjcpbm}, + + + bzcj=#{bzcj}, + + + cpmctymc=#{cpmctymc}, + + + cplb=#{cplb}, + + + flbm=#{flbm}, + + + ggxh=#{ggxh}, + + + qxlb =#{qxlb}, + + + tyshxydm=#{tyshxydm}, + + + ylqxzcrbarmc=#{ylqxzcrbarmc}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + + + sydycpbs=#{sydycpbs}, + + + sjcpbm=#{sjcpbm}, + + + versionNumber=#{versionNumber}, + + + diType=#{diType}, + + + ybbm=#{ybbm}, + + + sptm=#{sptm}, + + + manufactory=#{manufactory}, + + + measname=#{measname}, + + + productType=#{productType}, + + + scbssfbhph=#{scbssfbhph}, + + + scbssfbhxlh=#{scbssfbhxlh}, + + + scbssfbhscrq=#{scbssfbhscrq}, + + + scbssfbhsxrq=#{scbssfbhsxrq}, + + + cpms=#{cpms}, + + + allowNoBatch=#{allowNoBatch}, + + + allowNoExpire=#{allowNoExpire}, + + + allowNoProduct=#{allowNoProduct}, + + + allowNoSerial=#{allowNoSerial}, + + + spmc=#{spmc}, + + + cplx=#{cplx}, + + + hchzsb=#{hchzsb}, + + + cpdls=#{cpdls}, + + + price=#{price}, + + + basicPrductRemak1=#{basicPrductRemak1}, + + + basicPrductRemak2=#{basicPrductRemak2}, + + + basicPrductRemak3=#{basicPrductRemak3}, + + + basicPrductRemak4=#{basicPrductRemak4}, + + + basicPrductRemak5=#{basicPrductRemak5}, + + + basicPrductRemak6=#{basicPrductRemak6}, + + + basicPrductRemak7=#{basicPrductRemak7}, + + + basicPrductRemak8=#{basicPrductRemak8}, + where id = #{id} @@ -453,7 +807,10 @@ + select id, allowNoBatch from basic_products where nameCode = #{nameCode} limit 1 + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e664e1f6..b7caca54 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -43,6 +43,8 @@ basic_products.allowNoBatch, basic_products.allowNoExpire, basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, basic_products.cplx, basic_products.hchzsb, @@ -161,11 +163,12 @@ 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, + company_product_relevance.price, basic_products.basicPrductRemak1, basic_products.basicPrductRemak2, basic_products.basicPrductRemak3, @@ -251,62 +254,62 @@ + + + + + - select lowStockNum, overStockNum, recentDateTime + select id, lowStockNum, overStockNum, recentDateTime from basic_udirel where id = #{relId} @@ -939,4 +1114,138 @@ where basic_udirel.relCode = #{relCode} + + + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 456ad129..6ce578a8 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -30,79 +30,89 @@ @@ -225,7 +235,7 @@ SELECT * FROM company_product_relevance where udiRlIdFk = #{udiRlIdFk} - and customerId = #{customerId} + and customerId = #{customerId} @@ -275,45 +285,45 @@ replace - INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, - createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, - price, createUser, updateUser) + INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, + price, createUser, updateUser) values (#{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{createTime}, - #{updateTime}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk}, - #{price}, - #{createUser}, - #{updateUser}) + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{createTime}, + #{updateTime}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, + #{price}, + #{createUser}, + #{updateUser}) replace - INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, - createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, - price, createUser, updateUser) + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, + createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, + price, createUser, updateUser) values (#{id}, - #{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{createTime}, - #{updateTime}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk}, - #{price}, - #{createUser}, - #{updateUser}) + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{createTime}, + #{updateTime}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, + #{price}, + #{createUser}, + #{updateUser}) @@ -340,4 +350,20 @@ from company_product_relevance where udiRlIdFk = #{relId} + +