添加接口
This commit is contained in:
parent
a9f81e3b79
commit
0b80db757e
|
|
@ -199,4 +199,12 @@ public class InvoicingApi {
|
|||
return Result.OK("操作成功");
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value="获取物料分类树可采购的物料数量(采购单使用)", notes="获取物料分类树可采购的物料数量(采购单使用)")
|
||||
@GetMapping(value = "/getTreeDataWlnum")
|
||||
public Result<Map<String,Object>> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) {
|
||||
Map<String,Object> pageList = invoicingApi.getTreeDataWlnum(configMaterialCategory);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,4 +124,5 @@ public class MaterialInfoEntity implements Serializable {
|
|||
private String categoryName;
|
||||
private String typeName;
|
||||
private String medicationName;
|
||||
private String isAdd;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,4 +46,6 @@ public interface IInvoicingApi {
|
|||
List<Map<String, Object>> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory);
|
||||
|
||||
List<Map<String, Object>> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory);
|
||||
|
||||
Map<String, Object> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<ConfigMaterialInfo>
|
|||
IPage<ConfigMaterialInfo> getConfiguredList(Page<ConfigMaterialInfo> page, @Param("param") ConfigMaterialInfo configMaterialInfo);
|
||||
|
||||
ConfigMaterialInfo queryWlInfoByWlId(@Param("wlId") String wlId,@Param("nuId") String nuId);
|
||||
|
||||
List<ConfigMaterialInfo> getTreeDataWlnum(@Param(Constants.WRAPPER) QueryWrapper<ConfigMaterialInfo> queryWrapper);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getTreeDataWlnum" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo">
|
||||
select a.*
|
||||
from nu_warehouse_material_info a
|
||||
left join nu_config_material_info b on b.id = a.wl_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -535,4 +535,27 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
List<Map<String,Object>> pageList = configMaterialCategoryService.getWaringMaterialTreeData(configMaterialCategory);
|
||||
return pageList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
QueryWrapper<ConfigMaterialInfo> queryWrapper = new QueryWrapper<ConfigMaterialInfo>();
|
||||
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<ConfigMaterialInfo> list = configMaterialInfoMapper.getTreeDataWlnum(queryWrapper);
|
||||
map.put("success",true);
|
||||
map.put("message","可采购物料数量");
|
||||
map.put("totalSize",list.size());
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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是
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue