From 2c51593e394a32c50daf33500337957f3dd25d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 12 Sep 2017 00:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E-=E6=A0=B9=E6=8D=AE=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/action/materials/DepotHeadAction.java | 47 ++++++++++++---- .../com/jsh/dao/materials/DepotHeadDAO.java | 9 +++ .../com/jsh/dao/materials/DepotHeadIDAO.java | 2 + .../model/vo/materials/DepotHeadModel.java | 18 ++++++ .../service/materials/DepotHeadIService.java | 2 + .../service/materials/DepotHeadService.java | 4 ++ src/main/webapp/js/pages/materials/in_out.js | 55 +++++++++++++------ .../pages/materials/allocation_out_list.jsp | 5 ++ .../webapp/pages/materials/gift_out_list.jsp | 5 ++ .../pages/materials/gift_recharge_list.jsp | 5 ++ .../webapp/pages/materials/other_in_list.jsp | 5 ++ .../webapp/pages/materials/other_out_list.jsp | 5 ++ .../pages/materials/purchase_back_list.jsp | 5 ++ .../pages/materials/purchase_in_list.jsp | 4 ++ .../pages/materials/retail_back_list.jsp | 5 ++ .../pages/materials/retail_out_list.jsp | 5 ++ .../webapp/pages/materials/sale_back_list.jsp | 5 ++ .../webapp/pages/materials/sale_out_list.jsp | 5 ++ 18 files changed, 163 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 0ee9d571..f5786a1b 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -373,14 +373,40 @@ public class DepotHeadAction extends BaseAction return newNumber; } + /** + * 根据材料信息获取 + */ + public void getHeaderIdByMaterial(){ + try { + String materialParam = model.getMaterialParam(); //商品参数 + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + depotHeadService.getHeaderIdByMaterial(pageUtil, materialParam); + JSONObject outer = new JSONObject(); + String allReturn = pageUtil.getPageList().toString(); + allReturn = allReturn.substring(1,allReturn.length()-1); + if(allReturn.equals("null")){ + allReturn = ""; + } + outer.put("ret", allReturn); + //回写查询结果 + toClient(outer.toString()); + } + catch (JshException e) { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e); + } + catch (IOException e) { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e); + } + } + /** * 查找单据信息 * @return */ - public void findBy() - { - try - { + public void findBy() { + try { PageUtil pageUtil = new PageUtil(); pageUtil.setPageSize(model.getPageSize()); pageUtil.setCurPage(model.getPageNo()); @@ -392,10 +418,8 @@ public class DepotHeadAction extends BaseAction outer.put("total", pageUtil.getTotalCount()); //存放数据json数组 JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotHead depotHead:dataList) - { + if(null != dataList) { + for(DepotHead depotHead:dataList) { JSONObject item = new JSONObject(); item.put("Id", depotHead.getId()); item.put("ProjectId", depotHead.getProjectId()==null?"":depotHead.getProjectId().getId()); @@ -436,12 +460,10 @@ public class DepotHeadAction extends BaseAction //回写查询结果 toClient(outer.toString()); } - catch (DataAccessException e) - { + catch (DataAccessException e) { Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e); } - catch (IOException e) - { + catch (IOException e) { Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e); } } @@ -718,6 +740,7 @@ public class DepotHeadAction extends BaseAction condition.put("Type_s_eq",model.getType()); condition.put("SubType_s_eq",model.getSubType()); condition.put("Number_s_like",model.getNumber()); + condition.put("Id_s_in",model.getDhIds()); condition.put("OperTime_s_gteq",model.getBeginTime()); condition.put("OperTime_s_lteq",model.getEndTime()); condition.put("Id_s_order","desc"); diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index 3dd3511a..df0a4d6c 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -124,4 +124,13 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); pageUtil.setPageList(query.list()); } + + @SuppressWarnings("unchecked") + 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.Mfrs like '%" + materialParam + "%'"); + Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + pageUtil.setPageList(query.list()); + } } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java index 0f2c91e2..5dab9445 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java @@ -22,5 +22,7 @@ public interface DepotHeadIDAO extends BaseIDAO public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException; public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException; + + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException; } diff --git a/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java b/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java index 5b855c45..c9f70186 100644 --- a/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java +++ b/src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java @@ -42,6 +42,8 @@ public class DepotHeadModel implements Serializable private String MonthTime; //查询月份 private String supplierId; //单位Id，用于查询单位的应收应付 + private String MaterialParam; //商品参数 + private String dhIds; //单据id列表 /** * 分类ID @@ -363,4 +365,20 @@ public class DepotHeadModel implements Serializable public void setStatus(Boolean status) { Status = status; } + + public String getMaterialParam() { + return MaterialParam; + } + + public void setMaterialParam(String materialParam) { + MaterialParam = materialParam; + } + + public String getDhIds() { + return dhIds; + } + + public void setDhIds(String dhIds) { + this.dhIds = dhIds; + } } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadIService.java b/src/main/java/com/jsh/service/materials/DepotHeadIService.java index e6f30a5a..0bddb070 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadIService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadIService.java @@ -22,4 +22,6 @@ public interface DepotHeadIService extends BaseIService public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime, String type, Long pid,String dids)throws JshException; public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId)throws JshException; + + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam)throws JshException; } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadService.java b/src/main/java/com/jsh/service/materials/DepotHeadService.java index d9d6bf84..c2551989 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadService.java @@ -49,4 +49,8 @@ public class DepotHeadService extends BaseService implements DepotHea public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException { depotHeadDao.findMaterialsListByHeaderId(pageUtil, headerId); } + + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException { + depotHeadDao.getHeaderIdByMaterial(pageUtil, materialParam); + } } diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js index 21e455f7..510a32bd 100644 --- a/src/main/webapp/js/pages/materials/in_out.js +++ b/src/main/webapp/js/pages/materials/in_out.js @@ -536,7 +536,7 @@ detailFormatter: function(rowIndex, rowData){ return '' + '' + '
' + - '

商品信息: ' + rowData.MaterialsList + '

' + + '

商品信息： ' + rowData.MaterialsList + '

' + '
'; }, @@ -2019,7 +2019,7 @@ $("#saveDepotHead").click(); } //搜索按钮添加快捷键 - if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber")) + if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber"||obj.id=="searchMaterial")) { $("#searchBtn").click(); } @@ -2441,27 +2441,50 @@ } function showDepotHeadDetails(pageNo,pageSize){ + var materialParam = $.trim($("#searchMaterial").val()); $.ajax({ type:"post", - url: path + "/depotHead/findBy.action", + url: path + "/depotHead/getHeaderIdByMaterial.action", dataType: "json", data: ({ - Type: listType, - SubType:listSubType, - State:$.trim($("#searchState").val()), - Number:$.trim($("#searchNumber").val()), - BeginTime:$("#searchBeginTime").val(), - EndTime:$("#searchEndTime").val(), - pageNo:pageNo, - pageSize:pageSize + MaterialParam: materialParam }), - success: function (data) - { - $("#tableData").datagrid('loadData',data); + success: function (res) { + if(res) { + var ids = res.ret; + if(ids){ + $.ajax({ + type: "post", + url: path + "/depotHead/findBy.action", + dataType: "json", + data: ({ + Type: listType, + SubType: listSubType, + State: $.trim($("#searchState").val()), + Number: $.trim($("#searchNumber").val()), + BeginTime: $("#searchBeginTime").val(), + EndTime: $("#searchEndTime").val(), + dhIds: ids, + pageNo: pageNo, + pageSize: pageSize + }), + success: function (data) { + $("#tableData").datagrid('loadData', data); + }, + //此处添加错误处理 + error: function () { + $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); + return; + } + }); + } + else { + $("#tableData").datagrid('loadData', []); + } + } }, //此处添加错误处理 - error:function() - { + error:function() { $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); return; } diff --git a/src/main/webapp/pages/materials/allocation_out_list.jsp b/src/main/webapp/pages/materials/allocation_out_list.jsp index d191b9f5..08a6c9e3 100644 --- a/src/main/webapp/pages/materials/allocation_out_list.jsp +++ b/src/main/webapp/pages/materials/allocation_out_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_out_list.jsp b/src/main/webapp/pages/materials/gift_out_list.jsp index abdc7623..1dec35f5 100644 --- a/src/main/webapp/pages/materials/gift_out_list.jsp +++ b/src/main/webapp/pages/materials/gift_out_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_recharge_list.jsp b/src/main/webapp/pages/materials/gift_recharge_list.jsp index e61ad91d..2b940791 100644 --- a/src/main/webapp/pages/materials/gift_recharge_list.jsp +++ b/src/main/webapp/pages/materials/gift_recharge_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/other_in_list.jsp b/src/main/webapp/pages/materials/other_in_list.jsp index 10630e6a..ecbcb49a 100644 --- a/src/main/webapp/pages/materials/other_in_list.jsp +++ b/src/main/webapp/pages/materials/other_in_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/other_out_list.jsp b/src/main/webapp/pages/materials/other_out_list.jsp index 7782459c..c5e77110 100644 --- a/src/main/webapp/pages/materials/other_out_list.jsp +++ b/src/main/webapp/pages/materials/other_out_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_back_list.jsp b/src/main/webapp/pages/materials/purchase_back_list.jsp index bdb26955..be7aebf0 100644 --- a/src/main/webapp/pages/materials/purchase_back_list.jsp +++ b/src/main/webapp/pages/materials/purchase_back_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_in_list.jsp b/src/main/webapp/pages/materials/purchase_in_list.jsp index 995eccf4..9468c481 100644 --- a/src/main/webapp/pages/materials/purchase_in_list.jsp +++ b/src/main/webapp/pages/materials/purchase_in_list.jsp @@ -38,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_back_list.jsp b/src/main/webapp/pages/materials/retail_back_list.jsp index 8f2d1156..3a7c2786 100644 --- a/src/main/webapp/pages/materials/retail_back_list.jsp +++ b/src/main/webapp/pages/materials/retail_back_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_out_list.jsp b/src/main/webapp/pages/materials/retail_out_list.jsp index c47b2493..eb3570b3 100644 --- a/src/main/webapp/pages/materials/retail_out_list.jsp +++ b/src/main/webapp/pages/materials/retail_out_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_back_list.jsp b/src/main/webapp/pages/materials/sale_back_list.jsp index 4463ecff..5d61cbd9 100644 --- a/src/main/webapp/pages/materials/sale_back_list.jsp +++ b/src/main/webapp/pages/materials/sale_back_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_out_list.jsp b/src/main/webapp/pages/materials/sale_out_list.jsp index 814c37ca..fe1e41e8 100644 --- a/src/main/webapp/pages/materials/sale_out_list.jsp +++ b/src/main/webapp/pages/materials/sale_out_list.jsp @@ -19,6 +19,7 @@ + @@ -37,6 +38,10 @@ + 商品信息： + + + 单据日期：