From 0b80db757e11ad1e8858894c0808e7733b76f8e4 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 6 Nov 2025 10:20:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 8 +++++++ .../com/nu/entity/MaterialInfoEntity.java | 1 + .../modules/invoicing/api/IInvoicingApi.java | 2 ++ .../mapper/ConfigMaterialInfoMapper.java | 4 ++++ .../mapper/xml/ConfigMaterialInfoMapper.xml | 8 +++++++ .../impl/NuInvoicingCgdMainServiceImpl.java | 23 +++++++++++++++++++ .../entity/BlWarehouseMaterialInfo.java | 2 ++ .../xml/BlWarehouseMaterialInfoMapper.xml | 4 +++- 8 files changed, 51 insertions(+), 1 deletion(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index b1927e0..79ef79e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -199,4 +199,12 @@ public class InvoicingApi { return Result.OK("操作成功"); } + + @ApiOperation(value="获取物料分类树可采购的物料数量（采购单使用）", notes="获取物料分类树可采购的物料数量（采购单使用）") + @GetMapping(value = "/getTreeDataWlnum") + public Result> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index 74894f0..e1cb78a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -124,4 +124,5 @@ public class MaterialInfoEntity implements Serializable { private String categoryName; private String typeName; private String medicationName; + private String isAdd; } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 3aa505d..25a1f77 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -46,4 +46,6 @@ public interface IInvoicingApi { List> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory); List> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory); + + Map getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java index 269fa14..d059182 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java @@ -2,7 +2,9 @@ package com.nu.modules.ConfigMaterial.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.entity.MaterialInfoEntity; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; @@ -23,4 +25,6 @@ public interface ConfigMaterialInfoMapper extends BaseMapper IPage getConfiguredList(Page page, @Param("param") ConfigMaterialInfo configMaterialInfo); ConfigMaterialInfo queryWlInfoByWlId(@Param("wlId") String wlId,@Param("nuId") String nuId); + + List getTreeDataWlnum(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index f91ee04..c3613ef 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -48,4 +48,12 @@ left join sys_dict_item tag on a.tag_type = tag.item_value and tag.dict_id = '1978662656563613698' where a.id = #{wlId} + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 85af4e4..f629885 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -535,4 +535,27 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> pageList = configMaterialCategoryService.getWaringMaterialTreeData(configMaterialCategory); return pageList; } + + @Override + public Map getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map map = new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper(); + if(StringUtils.isEmpty(configMaterialCategory.getNuId())){ + map.put("success",false); + map.put("message","参数错误"); + map.put("totalSize",null); + return map; + } + queryWrapper.eq("a.nu_id",configMaterialCategory.getNuId()); + queryWrapper.eq("a.del_flag","0"); + queryWrapper.eq("a.iz_enabled","0"); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getCategoryId()),"b.category_id",configMaterialCategory.getCategoryId()); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getTypeId()),"b.type_id",configMaterialCategory.getTypeId()); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getMedicationId()),"b.medication_id",configMaterialCategory.getMedicationId()); + List list = configMaterialInfoMapper.getTreeDataWlnum(queryWrapper); + map.put("success",true); + map.put("message","可采购物料数量"); + map.put("totalSize",list.size()); + return map; + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java index 348263a..34169d1 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java @@ -184,4 +184,6 @@ public class BlWarehouseMaterialInfo implements Serializable { @TableField(exist = false) private java.lang.String wlParamInfo;//查询物料信息参数，可多个查询 + @TableField(exist = false) + private java.lang.String isAdd;//是否在购物车中添加 0否 1是 } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml index c4a53bd..c1f1903 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml @@ -29,9 +29,11 @@ b.sales_unit_price, b.reference_unit_price, b.material_img, - c.item_text as tagName + c.item_text as tagName, + if(d.id is null, '0', '1') as isAdd from nu_warehouse_material_info a left join nu_config_material_info b on a.wl_id = b.id + left join nu_invoicing_qgd_info d on a.wl_id = d.wl_id left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698' ) a ${ew.customSqlSegment}