Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13024 -r13037 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13024) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13037) @@ -7592,22 +7592,28 @@ } return list; } - public List getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type){ + + public List getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type,String hasInvoice){ List list = this.godownEntryItemManager.getGodownEntryItemList(startTime, endTime, suplier,"supplierName",warehouseId,type); List ret = new ArrayList(); GodownEntryItemVo vo = new GodownEntryItemVo(); if(list != null && !list.isEmpty()){ long index = 1; for(GodownEntryItem item : list){ - if(!StringUtils.equals(vo.getSupplierName(), item.getSupplierName())){ - if(vo.isValid()){ - vo.setIndex(index++); - ret.add(vo); - vo = new GodownEntryItemVo(); + if (StringUtils.isBlank(hasInvoice) + || (StringUtils.isNotBlank(hasInvoice) && hasInvoice + .equals(item.getHasInvoice()))) { + + if(!StringUtils.equals(vo.getSupplierName(), item.getSupplierName())){ + if(vo.isValid()){ + vo.setIndex(index++); + ret.add(vo); + vo = new GodownEntryItemVo(); + } } + vo.setSupplierName(item.getSupplierName()); + vo.addAmountAndTotalPrice(item.getAmount(), item.getCost()); } - vo.setSupplierName(item.getSupplierName()); - vo.addAmountAndTotalPrice(item.getAmount(), item.getCost()); } if(vo.isValid()){ vo.setIndex(index); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp =================================================================== diff -u -r12945 -r13037 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp (.../godownEntrySummaryView.jsp) (revision 12945) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp (.../godownEntrySummaryView.jsp) (revision 13037) @@ -1,3 +1,4 @@ +<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem"%> <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@page import="com.forgon.tools.SpringBeanManger" %> @@ -31,6 +32,9 @@ //入库单与退库单 var godownTypeIn = '<%=GodownEntry.TYPE_IN %>'; var godownTypeOut = '<%=GodownEntry.TYPE_OUT %>'; + +var hasInvoice_yes = '<%=GodownEntryItem.HAS_TYPE_YES %>'; +var hasInvoice_no = '<%=GodownEntryItem.HAS_TYPE_NO %>'; Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r13018 -r13037 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13018) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13037) @@ -717,8 +717,9 @@ String suplierName = StrutsParamUtils.getPraramValue("suplierName", ""); String warehouseId = StrutsParamUtils.getPraramValue("warehouseId", ""); - String type = StrutsParamUtils.getPraramValue("type", GodownEntry.TYPE_IN); - return jasperReportManager.getGodownSummaryReport(timeStart, timeEnd, suplierName,warehouseId,type); + String type = StrutsParamUtils.getPraramValue("type", GodownEntry.TYPE_IN); + String hasInvoice = StrutsParamUtils.getPraramValue("hasInvoice", ""); + return jasperReportManager.getGodownSummaryReport(timeStart, timeEnd, suplierName,warehouseId,type,hasInvoice); } return null; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java =================================================================== diff -u -r12804 -r13037 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 12804) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 13037) @@ -4,24 +4,19 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; - import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; - import org.apache.commons.lang.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; - import com.fasterxml.jackson.annotation.JsonIgnore; -import com.forgon.tools.db.DatabaseUtil; /** * 入库单 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js =================================================================== diff -u -r12945 -r13037 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js (.../godownEntrySummaryView.js) (revision 12945) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js (.../godownEntrySummaryView.js) (revision 13037) @@ -40,6 +40,11 @@ data : [[godownTypeIn],[godownTypeOut]] }); +var hasInvoiceStore = new Ext.data.SimpleStore({ + fields : ['value'], + data : [['全部'],[hasInvoice_yes],[hasInvoice_no]] +}); + function formatDate(date){ if(date instanceof Date){ var day=date.getDate() @@ -55,6 +60,7 @@ var suplierName = Ext.getCmp('suplierName').value; var warehouseId = Ext.getCmp('wareHouse').getValue(); var godownType = Ext.getCmp('godownType').getValue(); + var hasInvoice = Ext.getCmp('hasInvoice').getValue(); var paramStr = "jasperreportName=godownEntrySummary.jasper" + "&reportName=godownEntrySummary"; if(timeStart && timeEnd){ paramStr += "&timeStart=" + formatDate(timeStart); @@ -69,10 +75,13 @@ if(godownType == godownTypeOut){ reportParamTitle = "退库物品统计报表"; } + if(hasInvoice == "全部"){ + hasInvoice = ""; + } paramStr += "&title=" + reportParamTitle; paramStr += "&orgUnit=" + orgUnit; paramStr += "&warehouseId=" + warehouseId; - + paramStr += "&hasInvoice=" + hasInvoice; var reportUrl = WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?" +paramStr @@ -147,7 +156,7 @@ items : [{ layout : 'form', labelWidth : 60, - columnWidth : .2, + width : 180, items : [{ columnWidth : .5, layout : 'form', @@ -183,7 +192,7 @@ },{ layout : 'form', labelWidth : 60, - columnWidth : .2, + width : 180, items : [{ columnWidth : .5, layout : 'form', @@ -215,7 +224,7 @@ }, { layout : 'form', labelWidth : 60, - columnWidth : .2, + width : 250, items : [{ fieldLabel : '供应商', xtype : 'combo', @@ -241,10 +250,9 @@ } }] },{ - columnWidth : .20, layout : 'form', labelWidth : 40, - columnWidth : .2, + width : 160, items:[{ xtype : 'combo', fieldLabel : '仓库', @@ -265,7 +273,7 @@ },{ layout : 'form', labelWidth : 60, - columnWidth : .2, + width : 160, items:[{ xtype : 'combo', fieldLabel : '单类型', @@ -278,11 +286,32 @@ store : typeStore, value : godownTypeIn, allowBlank : false, - typeAhead : true, + typeAhead : true, + editable : false, forceSelection : true, triggerAction : 'all', anchor : '95%' }] + },{ + layout : 'form', + labelWidth : 60, + width : 170, + items:[{ + xtype : 'combo', + fieldLabel : '有无发票', + id : 'hasInvoice', + name : 'hasInvoice', + minChars : 0, + valueField : 'value', + displayField : 'value', + mode : 'local', + store : hasInvoiceStore, + typeAhead : true, + editable : false, + forceSelection : true, + triggerAction : 'all', + anchor : '95%' + }] }] }], buttons:[{ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java =================================================================== diff -u -r13032 -r13037 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 13032) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 13037) @@ -3,18 +3,15 @@ import java.text.SimpleDateFormat; import java.util.Comparator; import java.util.Date; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Transient; - import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; - import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; @@ -24,6 +21,10 @@ public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat( "yyyy-MM-dd"); + + public static final String HAS_TYPE_YES = "有"; + public static final String HAS_TYPE_NO = "无"; + private Long id; private DisposableGoodsStock diposableGoods; @@ -94,9 +95,6 @@ return id; } - public static String HAS_TYPE_YES = "有"; - public static String HAS_TYPE_NO = "无"; - public void setId(Long id) { this.id = id; } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r12974 -r13037 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 12974) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 13037) @@ -242,5 +242,5 @@ * @param type 单类型，入库单或者是退库单 * @return */ - public List getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type); + public List getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type,String hasInvoice); }