From 17b98d8ab02c06aa82e2039877cdf6832dcf12df Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 1 Aug 2024 12:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E4=BF=A1=E6=81=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BB=A5=E5=8F=8A=E5=B1=82=E7=BA=A7=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=8D=A2=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 20 +++++++++++++++++++ .../api/entity/basic/UdiProductEntity.java | 4 +++- .../glxp/api/req/basic/AddProductRequest.java | 9 +++++++++ .../api/res/basic/UdiRelevanceResponse.java | 7 ++++++- .../api/service/basic/UdiProductService.java | 17 +++++++++++++--- 5 files changed, 52 insertions(+), 5 deletions(-) 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 74f23672c..7e1967f37 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -326,20 +326,40 @@ public class UdiContrastController { } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updatetDrug") public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) { AddProductRequest udiRelevanceEntity = udiProductService.addDrug(addProductRequest); return ResultVOUtils.success(udiRelevanceEntity); } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateLevelDrug") public BaseResponse updateLevelDrug(@RequestBody UpdateLevelDrugRequest updateLevelDrugRequest) { udiProductService.saveOrUpadateLevelDrug(updateLevelDrugRequest); return ResultVOUtils.success("更新成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/calculateDistCount") + public BaseResponse calculateDistCount(@RequestBody UdiProductEntity udiProductEntity) { + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiProductService.calculateDistCount(udiProductEntity, udiRelevanceEntity); + return ResultVOUtils.success(udiRelevanceEntity); + } + + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/calculateUseCount") + public BaseResponse calculateUseCount(@RequestBody UdiProductEntity udiProductEntity) { + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiProductService.calculateUseCount(udiProductEntity, udiRelevanceEntity); + return ResultVOUtils.success(udiRelevanceEntity); } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/drug/delLevel") public BaseResponse delLevel(@RequestBody AddProductRequest addProductRequest) { boolean b = udiProductService.deleteByNameCode(addProductRequest.getNameCode()); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 8466536d3..a9ee1c289 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -1,6 +1,8 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +17,7 @@ import java.util.Date; @Data @TableName("basic_products") public class UdiProductEntity { - + @TableId(value = "id", type = IdType.INPUT) private Long id; @TableField(value = "uuid") private String uuid; diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 9aef9bae2..805508356 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -264,4 +264,13 @@ public class AddProductRequest { private Long id; + + private String distributeLevelDi; + private String distributeLevelUnit; + private Integer distributeLevelCount; + private String useLevelDi; + private String useLevelUnit; + private Integer useLeverCount; + + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 9dcc6aab8..631babff6 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -220,7 +220,6 @@ public class UdiRelevanceResponse { private Integer physicType; - /** * 包装规格 */ @@ -235,6 +234,12 @@ public class UdiRelevanceResponse { private Integer majorType; private Integer medicareType; + private String distributeLevelDi; + private String distributeLevelUnit; + private Integer distributeLevelCount; + private String useLevelDi; + private String useLevelUnit; + private Integer useLeverCount; public int getBhzxxsbzsl() { 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 9f4f7818d..03651297b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -253,6 +253,7 @@ public class UdiProductService { List udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid()); for (UdiProductEntity udiProductEntity : udiProductEntities) { addProductRequest.setNameCode(udiProductEntity.getNameCode()); + addProductRequest.setId(udiProductEntity.getId()); BeanUtils.copyProperties(addProductRequest, udiProductEntity); udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc()); udiProductEntity.setProductsType(2); @@ -263,6 +264,16 @@ public class UdiProductService { udiProductEntity.setDiType(1); } udiProductDao.updateById(udiProductEntity); + + //修改关联表 + udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount()); + udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi()); + udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit()); + udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi()); + udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit()); + udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount()); + udiRelevanceDao.updateById(udiRelevanceEntity); + } } else { udiRelevanceEntity = new UdiRelevanceEntity(); @@ -354,7 +365,7 @@ public class UdiProductService { * 根据当前层级标识计算流通拆零数量 */ public void calculateDistCount(UdiProductEntity udiProductEntity, UdiRelevanceEntity udiRelevanceEntity) { - List udiProductEntities = udiProductDao.findByOriginUuid(udiProductEntity.getUuid()); + List udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid()); CountWrapper xjCountWrapper = new CountWrapper(); findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper); udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode()); @@ -366,7 +377,7 @@ public class UdiProductService { * 根据当前层级标识计算使用拆零数量 */ public void calculateUseCount(UdiProductEntity udiProductEntity, UdiRelevanceEntity udiRelevanceEntity) { - List udiProductEntities = udiProductDao.findByOriginUuid(udiProductEntity.getUuid()); + List udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid()); CountWrapper xjCountWrapper = new CountWrapper(); findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper); udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode()); @@ -374,7 +385,7 @@ public class UdiProductService { udiRelevanceEntity.setUseLeverCount(xjCountWrapper.getCount()); } - public static UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List udiProductEntities, CountWrapper xjCountWrapper) { + public UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List udiProductEntities, CountWrapper xjCountWrapper) { if (StrUtil.isEmpty(udiProductEntity.getBhxjcpbm())) { xjCountWrapper.addCount(udiProductEntity.getBhxjsl()); return udiProductEntity;