diff --git a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java new file mode 100644 index 000000000..3c8851174 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java @@ -0,0 +1,7 @@ +package com.glxp.api.controller.basic; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class BasicDestinyRelController { +} diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java index 617256297..f7f088ea2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java @@ -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 list= basicProductCategoryService.selectAll(filterUdiProductRequest); + List list = basicProductCategoryService.selectAll(filterUdiProductRequest); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse 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 udiRelevanceResponses1 = basicProductCategoryService.selectAll(request); @@ -227,35 +227,35 @@ public class BasicProductCategoryController { list.add(udiRelevanceResponse.getId()); } filterUdiRelRequest.setExistid(list); - List udiRelevanceResponses=null; + List 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 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 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 udiRelevanceResponses=null; + List 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 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 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 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) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index cd9c634ed..7116e4ece 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -28,6 +28,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.*; import com.glxp.api.req.inv.FilterInvoiceRequest; import com.glxp.api.req.system.DeleteRequest; @@ -59,10 +60,7 @@ 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; -import java.util.List; +import java.util.*; /** * 单据业务详情 @@ -253,7 +251,8 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setUpdateUser(authAdmin.getId() + ""); orderEntity.setUpdateTime(new Date()); orderEntity.setCustomerId(authAdmin.getCustomerId() + ""); - orderEntity.setCorpOrderId(thrOrderEntity.getBillNo()); + long random = Calendar.getInstance().getTimeInMillis(); + orderEntity.setCorpOrderId(random+""); orderEntity.setAction(bussinessTypeEntity.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo()); @@ -298,7 +297,7 @@ public class IoOrderDetailBizController extends BaseController { UdiRlSupResponse udiRelevanceResponse = null; if (udiRelevanceEntities.size() == 1) { udiRelevanceResponse = udiRelevanceEntities.get(0); - ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); + ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getRlId()); ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); @@ -312,7 +311,7 @@ public class IoOrderDetailBizController extends BaseController { } ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + ""); } else { - ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName()); + ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getProductName()); ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setYlqxzcrbarmc(thrOrderDetailEntity.getYlqxzcrbarmc()); ioOrderDetailBizEntity.setManufacturer(thrOrderDetailEntity.getManufactory()); @@ -321,7 +320,7 @@ public class IoOrderDetailBizController extends BaseController { if (udiRelevanceEntities.size() > 1) { String bindRlIds = ""; for (UdiRlSupResponse temp : udiRelevanceEntities) { - bindRlIds = bindRlIds + "," + temp.getId(); + bindRlIds = bindRlIds + "," + temp.getRlId(); } ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1)); } @@ -547,10 +546,16 @@ public class IoOrderDetailBizController extends BaseController { IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId()); - + FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest(); + filterUdiRelRequest.setId(bizBindUpdateRequest.getBindRlFk()); + UdiRelevanceResponse udiRelevanceResponse=udiRelevanceService.selectOneUdi(filterUdiRelRequest); if (bizBindUpdateRequest.getBindRlFk() != null) orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk()); + if(udiRelevanceResponse!=null){ + orderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); + orderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); + } if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) { orderDetailBizEntity.setSupId(bizBindUpdateRequest.getSupId()); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index a0e5b2a2c..7893e1ee9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -84,7 +84,7 @@ public class IoOrderMutiController { if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) { return ResultVOUtils.error(999, "该产品不允许多次出库！"); } else { - if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) { + if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) { return ResultVOUtils.error(999, "该产品库存不足！"); } } @@ -121,11 +121,11 @@ public class IoOrderMutiController { ioOrderMutiEntityOne.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntityOne.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntityOne.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getUseNum()); ioOrderMutiEntityOne.setStatus(0); ioOrderMutiEntityOne.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntityOne.setUseCount(0); - ioOrderMutiEntityOne.setReCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntityOne.setReCount(udiProductEntity.getUseNum()); ioOrderMutiEntityOne.setCreateTime(new Date()); ioOrderMutiEntityOne.setUpdateTime(new Date()); ioOrderMutiEntityOne.setNameCode(udiProductEntity.getNameCode()); @@ -175,7 +175,7 @@ public class IoOrderMutiController { if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) { return ResultVOUtils.error(999, "该产品不允许多次出库！"); } else { - if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) { + if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) { return ResultVOUtils.error(999, "该产品库存不足！"); } } @@ -200,10 +200,10 @@ public class IoOrderMutiController { ioOrderMutiEntity1.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntity1.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntity1.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntity1.setTotalCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntity1.setTotalCount(udiProductEntity.getUseNum()); ioOrderMutiEntity1.setStatus(0); ioOrderMutiEntity1.setUseCount(0); - ioOrderMutiEntity1.setReCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntity1.setReCount(udiProductEntity.getUseNum()); ioOrderMutiEntity1.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntity1.setCreateTime(new Date()); ioOrderMutiEntity1.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/inout/PlatformController.java b/src/main/java/com/glxp/api/controller/inout/PlatformController.java index b8c0f81a6..435b86477 100644 --- a/src/main/java/com/glxp/api/controller/inout/PlatformController.java +++ b/src/main/java/com/glxp/api/controller/inout/PlatformController.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; +import javax.security.auth.AuthPermission; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,6 +55,15 @@ public class PlatformController { return ResultVOUtils.error(500, "删除失败"); } + @AuthRuleAnnotation("") + @PostMapping("/udiwms/platform/delect") + public BaseResponse delect(@RequestBody PlatformEntity platformEntity) { + if (platformService.remove(platformEntity.getId())>0) { + ResultVOUtils.success("删除成功"); + } + return ResultVOUtils.error(500, "删除失败"); + } + @AuthRuleAnnotation("") @PostMapping("/udiwms/platform/update") diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index db50e28f4..611b80494 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -202,10 +202,14 @@ public class ThrProductsController { if (StrUtil.isNotEmpty(value) && value.equals("1")) { UdiProductEntity udiProductEntity = udiProductService.findByNameCode(thrProductsEntity.getCode()); if (udiProductEntity != null) { + if (StrUtil.isNotEmpty(thrProductsEntity.getName())) + udiProductEntity.setCpmctymc(thrProductsEntity.getName()); if (StrUtil.isNotEmpty(thrProductsEntity.getMeasname())) udiProductEntity.setMeasname(thrProductsEntity.getMeasname()); if (StrUtil.isNotEmpty(thrProductsEntity.getSpec())) udiProductEntity.setGgxh(thrProductsEntity.getSpec()); + else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) + udiProductEntity.setGgxh(thrProductsEntity.getStandard()); if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); if (StrUtil.isNotEmpty(thrProductsEntity.getManufactory())) @@ -228,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); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java new file mode 100644 index 000000000..b1706ff09 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicDestinyRel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicDestinyRelMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicDestinyRel.java b/src/main/java/com/glxp/api/entity/basic/BasicDestinyRel.java new file mode 100644 index 000000000..47eeb9380 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicDestinyRel.java @@ -0,0 +1,35 @@ +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 lombok.Data; + +/** + * 定数包产品关联表 + */ +@Data +@TableName(value = "udi_wms.basic_destiny_rel") +public class BasicDestinyRel { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 耗材产品id + */ + @TableField(value = "relId") + private Long relId; + + /** + * 定数包模板id + */ + @TableField(value = "pId") + private Long pId; + + /** + * 数量 + */ + @TableField(value = "`count`") + private Integer count; +} \ No newline at end of file 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 c1893bd26..afa29631f 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -95,5 +95,6 @@ public class UdiProductEntity { private String mjfs; private String categoryName; private Date updateTime; + private Integer useNum; } 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 286bca11b..403d5b863 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -64,5 +64,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; - + private String category; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index bea9e34eb..9d4ac2525 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -72,6 +72,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String tyshxydm; private Boolean dispatch; private Boolean groupBuy; + private String category; private List uuids; private List ids; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index ff4cbf19f..31911abe7 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.thrsys; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @@ -51,4 +52,20 @@ public class ThrProductsResponse { private String manufactoryCode; private String supCode; + + public String getSpec() { + if(StrUtil.isNotEmpty(spec)){ + return spec; + } + if(StrUtil.isNotEmpty(standard)){ + return standard; + } + if(StrUtil.isNotEmpty(model)){ + return model; + } + return ""; + } + + + } diff --git a/src/main/java/com/glxp/api/service/basic/BasicDestinyRelService.java b/src/main/java/com/glxp/api/service/basic/BasicDestinyRelService.java new file mode 100644 index 000000000..2ec8ac5ca --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/BasicDestinyRelService.java @@ -0,0 +1,7 @@ +package com.glxp.api.service.basic; + +import org.springframework.stereotype.Service; + +public interface BasicDestinyRelService{ + +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml new file mode 100644 index 000000000..64cbdd712 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + id, relId, pId, `count` + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index f25339d4d..e1ce86b40 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -1098,7 +1098,7 @@ 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 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -570,7 +574,7 @@ AND (relCode is null - or trim(relCode) = '') + or trim(relCode) = '') AND supName LIKE concat('%', #{supName}, '%') @@ -589,9 +593,9 @@ 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}, '%')) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) @@ -601,10 +605,10 @@ 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}, '%')) AND basic_udirel.uuid = #{uuid} @@ -623,7 +627,7 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index bd6baa8d5..d2de50266 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -511,6 +511,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1); -INSERT ignore INTO `sys_param_config`(`parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, +INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`, `updateTime`) -VALUES (0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL); +VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);