purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据的商品选择增加类别选择

Browse Source
This commit is contained in:
季圣华
2020-12-15 23:24:01 +08:00
parent 5ee379241d
commit 518831dac5
17 changed files with 121 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -209,6 +209,7 @@ public class MaterialController {
}
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
item.put("MaterialName", MaterialName);
item.put("categoryName", material.getCategoryName());
item.put("name", material.getName());
item.put("expand", expand);
item.put("model", material.getModel());

2
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
View File

@@ -38,5 +38,5 @@ public interface MaterialCategoryMapperEx {
List<MaterialCategory> getMaterialCategoryListByCategoryIds(@Param("parentIds") String[] categoryIds);
List<MaterialCategory> getListByParentId(Long parentId);
List<MaterialCategory> getListByParentId(@Param("parentId") Long parentId);
}

8
src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -99,12 +99,14 @@
</select>
<select id="findBySelectWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
select m.*,u.name unit_name,me.bar_code m_bar_code,me.id meId,me.commodity_unit from jsh_material m
select m.*,u.name unit_name,mc.name categoryName,me.bar_code m_bar_code,me.id meId,me.commodity_unit from jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1'
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2'
where m.enabled=1 and me.id is not null
<if test="q != null">
and (m.name like '%${q}%' or me.bar_code like '%${q}%')
<if test="q != null and q !=''">
<bind name="bindKey" value="'%'+q+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if>
<if test="idList.size()>0">
and m.category_id in