diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index e4ca6588..27f9c8ea 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -122,7 +122,7 @@ public class DepotHeadDAO extends BaseDAO 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 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()); } diff --git a/src/main/webapp/pages/materials/allocation_out_list.jsp b/src/main/webapp/pages/materials/allocation_out_list.jsp index 6f8e1c1d..2476827f 100644 --- a/src/main/webapp/pages/materials/allocation_out_list.jsp +++ b/src/main/webapp/pages/materials/allocation_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/assemble_list.jsp b/src/main/webapp/pages/materials/assemble_list.jsp index d6a91e70..bd7ba1d1 100644 --- a/src/main/webapp/pages/materials/assemble_list.jsp +++ b/src/main/webapp/pages/materials/assemble_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/disassemble_list.jsp b/src/main/webapp/pages/materials/disassemble_list.jsp index 13f77a65..e089d7c1 100644 --- a/src/main/webapp/pages/materials/disassemble_list.jsp +++ b/src/main/webapp/pages/materials/disassemble_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_out_list.jsp b/src/main/webapp/pages/materials/gift_out_list.jsp index f403257b..cad30045 100644 --- a/src/main/webapp/pages/materials/gift_out_list.jsp +++ b/src/main/webapp/pages/materials/gift_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_recharge_list.jsp b/src/main/webapp/pages/materials/gift_recharge_list.jsp index cb7c05a4..2999e724 100644 --- a/src/main/webapp/pages/materials/gift_recharge_list.jsp +++ b/src/main/webapp/pages/materials/gift_recharge_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/other_in_list.jsp b/src/main/webapp/pages/materials/other_in_list.jsp index b03e4aac..3f6231dd 100644 --- a/src/main/webapp/pages/materials/other_in_list.jsp +++ b/src/main/webapp/pages/materials/other_in_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/other_out_list.jsp b/src/main/webapp/pages/materials/other_out_list.jsp index 6e38c6b4..1552ec4f 100644 --- a/src/main/webapp/pages/materials/other_out_list.jsp +++ b/src/main/webapp/pages/materials/other_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_back_list.jsp b/src/main/webapp/pages/materials/purchase_back_list.jsp index bd7b2586..bda51069 100644 --- a/src/main/webapp/pages/materials/purchase_back_list.jsp +++ b/src/main/webapp/pages/materials/purchase_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_in_list.jsp b/src/main/webapp/pages/materials/purchase_in_list.jsp index 0b66495c..e0f17ab6 100644 --- a/src/main/webapp/pages/materials/purchase_in_list.jsp +++ b/src/main/webapp/pages/materials/purchase_in_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_back_list.jsp b/src/main/webapp/pages/materials/retail_back_list.jsp index 7410e010..e1ec053e 100644 --- a/src/main/webapp/pages/materials/retail_back_list.jsp +++ b/src/main/webapp/pages/materials/retail_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_out_list.jsp b/src/main/webapp/pages/materials/retail_out_list.jsp index 7c511c50..62398605 100644 --- a/src/main/webapp/pages/materials/retail_out_list.jsp +++ b/src/main/webapp/pages/materials/retail_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_back_list.jsp b/src/main/webapp/pages/materials/sale_back_list.jsp index 6e75e058..427715cd 100644 --- a/src/main/webapp/pages/materials/sale_back_list.jsp +++ b/src/main/webapp/pages/materials/sale_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_out_list.jsp b/src/main/webapp/pages/materials/sale_out_list.jsp index 6d5f75fa..e91a66e3 100644 --- a/src/main/webapp/pages/materials/sale_out_list.jsp +++ b/src/main/webapp/pages/materials/sale_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期：