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 79ef79e3..ce6455c9 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 @@ -3,7 +3,9 @@ package com.nu.modules.pad.invoicing.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nu.entity.*; import com.nu.modules.invoicing.api.IInvoicingApi; +import io.netty.util.internal.StringUtil; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Autowired; @@ -207,4 +209,15 @@ public class InvoicingApi { return Result.OK(pageList); } + + @ApiOperation(value="根据物料id获取供应商信息", notes="根据物料id获取供应商信息") + @GetMapping(value = "/getGysListByWlId") + public Result> getGysListByWlId(MaterialInfoEntity materialInfoEntity) { + if(StringUtils.isEmpty(materialInfoEntity.getWlId())){ + return Result.error("请选择物料"); + } + Map pageList = invoicingApi.getGysListByWlId(materialInfoEntity); + 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 25a1f77c..7beb4d4a 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 @@ -48,4 +48,6 @@ public interface IInvoicingApi { List> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory); Map getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); + + Map getGysListByWlId(MaterialInfoEntity materialInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java index dfe017c7..28e6c433 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java @@ -192,4 +192,6 @@ public class ConfigMaterialInfo implements Serializable { //综合搜索 @TableField(exist = false) private String keyWord; + @TableField(exist = false) + private String suppliersName; } 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 d059182f..f3cc6614 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 @@ -27,4 +27,6 @@ public interface ConfigMaterialInfoMapper extends BaseMapper ConfigMaterialInfo queryWlInfoByWlId(@Param("wlId") String wlId,@Param("nuId") String nuId); List getTreeDataWlnum(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + ConfigMaterialInfo getGysListByWlId(@Param("wlId") String wlId); } 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 ab6bdc96..827b782d 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 @@ -65,4 +65,12 @@ left join nu_config_material_info b on b.id = a.wl_id ${ew.customSqlSegment} + + \ 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 f6298856..e4027849 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 @@ -558,4 +558,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getGysListByWlId(MaterialInfoEntity materialInfoEntity) { + ConfigMaterialInfo info = configMaterialInfoMapper.getGysListByWlId(materialInfoEntity.getWlId()); + Map map = new HashMap<>(); + if (info != null){ + map.put("suppliers",info.getSuppliers()); + map.put("suppliers_dictText",info.getSuppliersName()); + } + return map; + } }