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 ce6455c9..90ff58a2 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 @@ -202,7 +202,7 @@ public class InvoicingApi { } - @ApiOperation(value="获取物料分类树可采购的物料数量(采购单使用)", notes="获取物料分类树可采购的物料数量(采购单使用)") + @ApiOperation(value="获取物料分类树可采购的物料数量(仓库列表使用)", notes="获取物料分类树可采购的物料数量(仓库列表使用)") @GetMapping(value = "/getTreeDataWlnum") public Result> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { Map pageList = invoicingApi.getTreeDataWlnum(configMaterialCategory); @@ -220,4 +220,21 @@ public class InvoicingApi { return Result.OK(pageList); } + + + @ApiOperation(value="获取物料分类树可采购的物料数量(购物车列表使用)", notes="获取物料分类树可采购的物料数量(购物车列表使用)") + @GetMapping(value = "/getGwcTreeDataWlnum") + public Result> getGwcTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getGwcTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } + + + @ApiOperation(value="获取物料分类树可采购的物料数量(购物车列表使用)", notes="获取物料分类树可采购的物料数量(购物车列表使用)") + @GetMapping(value = "/getCgdTreeDataWlnum") + public Result> getCgdTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getCgdTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } + } 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 7beb4d4a..ef9d6fad 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 @@ -50,4 +50,8 @@ public interface IInvoicingApi { Map getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); Map getGysListByWlId(MaterialInfoEntity materialInfoEntity); + + Map getGwcTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); + + Map getCgdTreeDataWlnum(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 f3cc6614..7916d76e 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 @@ -29,4 +29,8 @@ public interface ConfigMaterialInfoMapper extends BaseMapper List getTreeDataWlnum(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); ConfigMaterialInfo getGysListByWlId(@Param("wlId") String wlId); + + List getGwcTreeDataWlnum(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List getCgdTreeDataWlnum(@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 827b782d..dad217fd 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 @@ -73,4 +73,19 @@ GROUP BY a.id,a.suppliers + + + + + \ 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 e4027849..36b5fa94 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 @@ -554,7 +554,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = configMaterialInfoMapper.getTreeDataWlnum(queryWrapper); map.put("success",true); - map.put("message","可采购物料数量"); + map.put("message","物料数量"); map.put("totalSize",list.size()); return map; } @@ -569,4 +569,39 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getGwcTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map map = new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper(); + 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.getGwcTreeDataWlnum(queryWrapper); + map.put("success",true); + map.put("message","物料数量"); + map.put("totalSize",list.size()); + return map; + } + + @Override + public Map getCgdTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map map = new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper(); + if(StringUtils.isEmpty(configMaterialCategory.getCgdId())){ + map.put("success",false); + map.put("message","参数错误"); + map.put("totalSize",null); + return map; + } + queryWrapper.eq("a.cgd_id",configMaterialCategory.getCgdId()); + 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.getCgdTreeDataWlnum(queryWrapper); + map.put("success",true); + map.put("message","物料数量"); + map.put("totalSize",list.size()); + return map; + } }