Skip to content
GitLab
Commit 518831da authored by 季圣华's avatar 季圣华
Browse files

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

parent 5ee37924
Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/bill/in_out.js
View file @ 518831da
......@@ -1293,6 +1293,7 @@
{field: 'id',width:35,align:"center",checkbox:true},
{field: 'mBarCode', title: '条码', width: 120},
{field: 'name', title: '名称', width: 140},
{field: 'categoryName', title: '类别', width: 80},
{field: 'standard', title: '规格', width: 80},
{field: 'model', title: '型号', width: 80},
{field: 'unit', title: '单位', width: 60},
......@@ -1338,6 +1339,7 @@
url: "/material/findBySelect",
dataType: "json",
data: ({
categoryId: $("#searchMaterialCategory").combotree("getValue"),
q: $("#searchBarCode").textbox("getValue"),
mpList: mPropertyList,
depotId: depotId,
......@@ -1372,6 +1374,14 @@
pageSize: initPageSize
});
});
//重置按钮
$("#searchMaterialResetBtn").unbind().bind({
click: function () {
$("#searchMaterialCategory").combotree("setValue","");
$("#searchBarCode").textbox("setValue","");
$("#searchMaterialBtn").click();
}
});
$("#appendMaterial").off("click").on("click",function(){
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
});
......
erp_web/pages/bill/allocation_out_list.html
View file @ 518831da
......@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/assemble_list.html
View file @ 518831da
......@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/disassemble_list.html
View file @ 518831da
......@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/other_in_list.html
View file @ 518831da
......@@ -151,15 +151,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/other_out_list.html
View file @ 518831da
......@@ -145,15 +145,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/purchase_back_list.html
View file @ 518831da
......@@ -272,15 +272,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/purchase_in_list.html
View file @ 518831da
......@@ -300,15 +300,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/purchase_orders_list.html
View file @ 518831da
......@@ -200,15 +200,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/retail_back_list.html
View file @ 518831da
......@@ -212,15 +212,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/retail_out_list.html
View file @ 518831da
......@@ -249,15 +249,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/sale_back_list.html
View file @ 518831da
......@@ -273,15 +273,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/sale_orders_list.html
View file @ 518831da
......@@ -202,15 +202,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
erp_web/pages/bill/sale_out_list.html
View file @ 518831da
......@@ -300,15 +300,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
<div class="box-body form-inline">
<div class="form-group">
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
<div class="control-inline">
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
</select>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
</div>
</div>
......
src/main/java/com/jsh/erp/controller/MaterialController.java
View file @ 518831da
......@@ -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());
......
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
View file @ 518831da
......@@ -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);
}
src/main/resources/mapper_xml/MaterialMapperEx.xml
View file @ 518831da
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment