From aca6d40af5856ebe6ced44a8e54ed8b456626d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 3 Nov 2017 00:15:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E5=86=B5=E6=8A=A5=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/dao/materials/DepotItemDAO.java | 42 ++++++++++++------- .../pages/reports/in_out_stock_report.jsp | 12 +++--- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/jsh/dao/materials/DepotItemDAO.java b/src/main/java/com/jsh/dao/materials/DepotItemDAO.java index bbb60b94..c285cc80 100644 --- a/src/main/java/com/jsh/dao/materials/DepotItemDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotItemDAO.java @@ -23,25 +23,39 @@ public class DepotItemDAO extends BaseDAO implements DepotItemIDAO @SuppressWarnings("unchecked") @Override - public void findByType(PageUtil pageUtil,String type,Integer ProjectId,Long MId,String MonthTime,Boolean isPrev) throws JshException { + public void findByType(PageUtil pageUtil,String type,Integer dId,Long MId,String MonthTime,Boolean isPrev) throws JshException { //多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便 Query query; StringBuffer queryString = new StringBuffer(); - if(isPrev) { - queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'"); - if(ProjectId!=null) { - queryString.append(" and DepotId='" + ProjectId +"'"); + if(type.equals("入库")) { + if (isPrev) { + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id "); + queryString.append(" and ((type='入库' and DepotId='" + dId + "') " + + " or (SubType='调拨' and AnotherDepotId='" + dId + "') " + + " or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) "); + queryString.append(" and MaterialId =" + MId + " and dh.OperTime <'" + MonthTime + "-01 00:00:00' "); + query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + } else { + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id "); + queryString.append(" and ((type='入库' and DepotId='" + dId + "') " + + " or (SubType='调拨' and AnotherDepotId='" + dId + "') " + + " or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) "); + queryString.append(" and MaterialId =" + MId + " and dh.OperTime >='" + MonthTime + "-01 00:00:00' and dh.OperTime <='" + MonthTime + "-31 59:59:59' "); + query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } - queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' "); - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } else { - queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'"); - if(ProjectId!=null) { - queryString.append(" and DepotId='" + ProjectId +"'"); + if (isPrev) { + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'"); + queryString.append(" and DepotId='" + dId + "'"); + queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime <'" + MonthTime + "-01 00:00:00' "); + query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + } else { + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'"); + queryString.append(" and DepotId='" + dId + "'"); + queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' "); + query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } - queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 59:59:59' "); - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } pageUtil.setTotalCount(query.list().size()); pageUtil.setPageList(query.list()); @@ -54,12 +68,12 @@ public class DepotItemDAO extends BaseDAO implements DepotItemIDAO Query query; StringBuffer queryString = new StringBuffer(); if(type.equals("入库")) { - queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='" + type +"'"); + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='入库'"); queryString.append(" and MaterialId ="+ MId); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } else { - queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='" + type +"'"); + queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='出库'"); queryString.append(" and SubType!='调拨' and SubType!='礼品充值' and MaterialId ="+ MId); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); } diff --git a/src/main/webapp/pages/reports/in_out_stock_report.jsp b/src/main/webapp/pages/reports/in_out_stock_report.jsp index c50bcaa5..2470f89c 100644 --- a/src/main/webapp/pages/reports/in_out_stock_report.jsp +++ b/src/main/webapp/pages/reports/in_out_stock_report.jsp @@ -87,7 +87,7 @@ $.messager.alert('导出提示','请先选择月份再进行查询！','error'); } else { - showPersonDetails(1,3000); + showEachDetails(1,3000); //此处直接去做get请求，用下面的查询每月统计的方法，去获取list，参数长度虽长，但还是可以用get //window.location.href = "<%=path%>/depotItem/exportExcel.action?browserType=" + getOs(); } @@ -179,7 +179,7 @@ } } } - $("#searchProjectId").empty().append('').append(options); + $("#searchProjectId").empty().append(options); } } @@ -289,8 +289,8 @@ { pageNumber:pageNum, pageSize:pageSize - }); - showPersonDetails(pageNum,pageSize); + }); + showEachDetails(pageNum,pageSize); } }); } @@ -308,7 +308,7 @@ //搜索处理 function search() { - showPersonDetails(1,initPageSize); + showEachDetails(1,initPageSize); var opts = $("#tableData").datagrid('options'); var pager = $("#tableData").datagrid('getPager'); opts.pageNumber = 1; @@ -326,7 +326,7 @@ } }); - function showPersonDetails(pageNo,pageSize) + function showEachDetails(pageNo,pageSize) { $.ajax({ type:"post",