From 31135bd33d7727307dd8a6d5ead9d74c8036c6da Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 16 Oct 2025 14:25:58 +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 --- .../nu/modules/pad/invoicing/api/InvoicingApi.java | 11 +++++++++++ .../java/com/nu/entity/MaterialCategoryEntity.java | 3 +++ .../main/java/com/nu/entity/MaterialInfoEntity.java | 2 ++ .../com/nu/modules/invoicing/api/IInvoicingApi.java | 2 ++ nursing-unit-invoicing/nu-invoicing-biz/pom.xml | 8 +++++++- .../entity/ConfigMaterialCategory.java | 4 ++++ .../impl/ConfigMaterialCategoryServiceImpl.java | 2 ++ .../service/impl/NuInvoicingCgdMainServiceImpl.java | 13 +++++++++++++ 8 files changed, 44 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 48fe7e9..4c9e3fb 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 @@ -85,8 +85,19 @@ public class InvoicingApi { @ApiOperation(value="获取物料分类树", notes="获取物料分类树") @GetMapping(value = "/getMaterialTreeData") public Result>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("0"); List> pageList = invoicingApi.getMaterialTreeData(configMaterialCategory); return Result.OK(pageList); } + + @ApiOperation(value="修改库房启用停用", notes="修改库房启用停用") + @AutoLog(value = "修改库房启用停用") + @PostMapping(value = "/updateKfstatus") + public Result updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity) { + invoicingApi.updateKfstatus(nuBaseInfoEntity); + return Result.OK("修改成功！"); + } + + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java index 95dab29..a3919ef 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java @@ -60,4 +60,7 @@ public class MaterialCategoryEntity implements Serializable { private Integer typeRowSpan; private Integer num; + + private java.lang.String appIconPath; + private java.lang.String appCheckIconPath; } 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 1b6edfd..5b78472 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 @@ -105,4 +105,6 @@ public class MaterialInfoEntity implements Serializable { @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") private String nuId;//库房id + private java.lang.String wlParamInfo; + } 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 c56ea27..fa22ed8 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 @@ -22,4 +22,6 @@ public interface IInvoicingApi { void reviewPurchaseOrder(CgdMainEntity cgdMainEntity); List> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory); + + void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/pom.xml b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml index 2516b7e..911b56f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml @@ -37,6 +37,12 @@ pinyin4j 2.5.0 - + + com.nursingunit.boot + nu-nu-biz + 2.0.0 + compile + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java index a848f90..7ca3135 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -71,6 +71,10 @@ public class ConfigMaterialCategory implements Serializable { private java.lang.String sysOrgCode; private java.lang.String icon; + private java.lang.String appIconPath; + private java.lang.String appCheckIconPath; + + private Integer sort; @TableField(exist = false) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index 3762562..b0b31ff 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -212,6 +212,8 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.apply(StringUtils.isNotBlank(warehouseMaterialInfo.getWlParamInfo()),"( material_name like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or material_no like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or pinyin like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or specification_model like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' ) "); Page page = new Page<>(pageNo, pageSize); List list = warehouseMaterialInfoMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); @@ -373,4 +379,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> pageList = configMaterialCategoryService.getMaterialTreeData(configMaterialCategory); return pageList; } + + @Override + public void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity) { + NuBaseInfo nuBaseInfo = new NuBaseInfo(); + BeanUtils.copyProperties(nuBaseInfoEntity,nuBaseInfo); + nuBaseInfoMapper.updateById(nuBaseInfo); + } }