Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r13158 -r13160 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13158) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13160) @@ -44,13 +44,15 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoring; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringAnswer; @@ -87,6 +89,7 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; /** * @author wangyi 2012-08-15 下午12:04 @@ -120,6 +123,8 @@ private GoodsOptionManager goodsOptionManager; + private WareHouseManager wareHouseManager; + public void setGoodsOptionManager(GoodsOptionManager goodsOptionManager) { this.goodsOptionManager = goodsOptionManager; } @@ -170,6 +175,10 @@ this.jasperReportManager = jasperReportManager; } + public void setWareHouseManager(WareHouseManager wareHouseManager) { + this.wareHouseManager = wareHouseManager; + } + /** * 报表中心,sql做数据源 * @@ -921,20 +930,34 @@ } }else if(reportName.equals("stocktakeSummaryReport")){ String id = StrutsParamUtils.getPraramValue("id", ""); + String type = StrutsParamUtils.getPraramValue("type", ""); if(StringUtils.isNotBlank(id)){ StockTakeRecord record = (StockTakeRecord)objectDao.getByProperty(StockTakeRecord.class.getSimpleName(), "inventoryRecordId", Long.valueOf(id)); StockTakeRecord lastRecord = null; if(record != null){ String sql = "where po.warehouseId = " + record.getWarehouseId() + " and id < " + record.getId() + " order by id desc"; lastRecord = (StockTakeRecord)objectDao.getBySql(StockTakeRecord.class.getSimpleName(), sql); } - SimpleDateFormat sfd = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + SimpleDateFormat sfd = new SimpleDateFormat("yyyy.MM.dd"); String endDate = sfd.format(record.getStockTakeDate()); String startDate = ""; if(lastRecord != null){ startDate = sfd.format(lastRecord.getStockTakeDate()); } - map.put("title", "物资收发存汇总表（" + startDate + " & " + endDate + "）"); + String dateTime = "出入日期: "+startDate; + if(StringTools.isNotEmpty(startDate)){ + dateTime += " 至 " + endDate; + } + WareHouse warehouse = wareHouseManager.getWareHouseById(record.getWarehouseId()); + String warehouseNae = ""; + if(warehouse != null){ + warehouseNae = warehouse.getName(); + } + map.put("dateTime", dateTime); + map.put("type", type); + map.put("warehouse", warehouseNae); + map.put("title", "出入库统计表 [ " + AcegiHelper.getLoginUser().getCurrentOrgUnitName() + " ] "); + } } else if (reportName.equals("monthReport")){ String startTime = StrutsParamUtils.getPraramValue("startTime", ""); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r13124 -r13160 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 13124) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 13160) @@ -40,6 +40,7 @@ import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.SqlBuilder; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.SqlUtils; @@ -306,6 +307,9 @@ * @return */ public WareHouse getWareHouseById(Long id){ + if(!DatabaseUtil.isPoIdValid(id)){ + return null; + } return (WareHouse)objectDao.getByProperty(WareHouse.class.getSimpleName(), "id", id); } Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jasper =================================================================== diff -u -r13158 -r13160 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml =================================================================== diff -u -r13158 -r13160 --- ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml (.../stocktakeSummaryReport.jrxml) (revision 13158) +++ ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml (.../stocktakeSummaryReport.jrxml) (revision 13160) @@ -1,5 +1,5 @@ - + @@ -25,6 +25,9 @@ + + + @@ -101,88 +104,127 @@ - <band height="39" splitType="Stretch"> + <band height="49" splitType="Stretch"> <textField> - <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="1015" height="39"/> + <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="630" height="29"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="218" y="29" width="412" height="20"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="12" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$P{dateTime}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="57" y="29" width="161" height="20"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="12" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$P{warehouse}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" x="6" y="29" width="40" height="20" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="14" isBold="false"/> + </textElement> + <text><![CDATA[仓库:]]></text> + </staticText> </band> - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + +