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

出入库单据去掉'颜色'字段的显示[主线]

Browse Source
This commit is contained in:
季圣华
2017-10-19 23:33:37 +08:00
parent 0eb4a54de3
commit 99474cd7d7
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
View File

@@ -122,7 +122,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
@SuppressWarnings("unchecked")
public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException {
StringBuffer queryString = new StringBuffer();
queryString.append("select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model,' ',jsh_material.Color)) as mName from jsh_depotitem inner join jsh_material " +
queryString.append("select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName from jsh_depotitem inner join jsh_material " +
" on jsh_depotitem.MaterialId = jsh_material.Id where jsh_depotitem.HeaderId ="+ headerId);
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
pageUtil.setPageList(query.list());
@@ -164,7 +164,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException {
StringBuffer queryString = new StringBuffer();
queryString.append("select group_concat(CAST(dt.HeaderId AS CHAR)) as ids from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where m.`Name` "+
" like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%' or m.Color like '%" + materialParam + "%'");
" like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%'");
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
pageUtil.setPageList(query.list());
}

2
src/main/webapp/pages/materials/allocation_out_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/assemble_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/disassemble_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/gift_out_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/gift_recharge_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/other_in_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/other_out_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/purchase_back_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/purchase_in_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/retail_back_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/retail_out_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/sale_back_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>

2
src/main/webapp/pages/materials/sale_out_list.jsp
View File

@@ -39,7 +39,7 @@
</td>
<td>商品信息：</td>
<td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，颜色" style="width:120px;"/>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td>
<td>单据日期：</td>
<td>