Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java =================================================================== diff -u -r14363 -r15297 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 14363) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 15297) @@ -3,6 +3,12 @@ */ package com.forgon.disinfectsystem.jasperreports.javabeansource; +import java.util.Date; + +import com.forgon.Constants; +import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.ForgonDateUtils; + /** * @author WangYi * 2014-4-14 下午4:57:28 @@ -20,6 +26,18 @@ private String time; private String applicant; + /** + * 发货员 + */ + private String sender; + /** + * 核对员 + */ + private String assistantSender; + /** + * 失效期 + */ + private String expDate; private String batch; @@ -98,6 +116,30 @@ this.applicant = applicant; } + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = StringTools.defaultString(sender); + } + + public String getAssistantSender() { + return assistantSender; + } + + public void setAssistantSender(String assistantSender) { + this.assistantSender = StringTools.defaultString(assistantSender); + } + + public String getExpDate() { + return expDate; + } + + public void setExpDate(Date expDate) { + this.expDate = ForgonDateUtils.safelyFormatDate(expDate, Constants.DATEFORMAT_YYYYMMDD, ""); + } + public String getBatch() { return batch; } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15296 -r15297 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15296) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15297) @@ -40,6 +40,7 @@ import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.databaseadapter.service.SqlFunctionsAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; @@ -70,10 +71,12 @@ import com.forgon.disinfectsystem.entity.devicemonitoring.DeviceMonitoring; import com.forgon.disinfectsystem.entity.disposablegoods.DisposableGoodsInventory; import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; +import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; +import com.forgon.disinfectsystem.entity.invoicemanager.MaterialInvoice; import com.forgon.disinfectsystem.entity.invoicemanager.MaterialItem; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem; @@ -6839,16 +6842,22 @@ String sql = " "; String tousseSql = "select '器械包' as type,po.orgUnitCoding,po.settleAccountsDepart,po.depart,do.barcode,bo.tousseName as name,bo.price," + "bo.statisticsAmount as amount,po.sendTime,po.applicant,'' as batch,'' as externalCode,po.remark as remark,bo.sterileEndTime as sterileEndTime," - + "bo.sterilizerName as sterilizerName,bo.sterileFrequency as sterileFrequency,po.hospitalNumber as hospitalNumber from Invoice po,BarcodeDevice " - + "do,TousseInstance bo where po.id = bo.invoice_id and bo.id = do.id " + remarkCondition + hospitalNumberSql; + + "bo.sterilizerName as sterilizerName,bo.sterileFrequency as sterileFrequency,po.hospitalNumber as hospitalNumber,po.sender,po.assistantSender,bo.validUntil as expDate from " + + Invoice.class.getSimpleName() + " po," + BarcodeDevice.class.getSimpleName()+ " do," + + TousseInstance.class.getSimpleName()+" bo where po.id = bo.invoice_id and bo.id = do.id " + remarkCondition + hospitalNumberSql; String diposableSql = "select '一次性物品' as type,po.orgUnitCoding, po.settleAccountsDepart,po.depart,bo.barcode,bo.name,bo.price,bo.amount," + "po.sendTime,po.applicant,bo.batch,dg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," - + "po.hospitalNumber as hospitalNumber from Invoice po,DiposableGoodsItem bo,DisposableGoods dg where po.id = bo.invoice_id and " + + "po.hospitalNumber as hospitalNumber,po.sender,po.assistantSender,dgbs.expDate from " + + Invoice.class.getSimpleName() + " po," + DiposableGoodsItem.class.getSimpleName()+" bo," + + DisposableGoods.class.getSimpleName() + " dg,"+ DisposableGoodsBatchStock.class.getSimpleName() +" dgbs where po.id = bo.invoice_id and " + + " bo.disposableGoodsBatchStockID=dgbs.id and " + "bo.disposableGoodsID = dg.id " + remarkCondition + hospitalNumberSql; String materialSql = "select '材料' as type,po.orgUnitCoding, po.settleAccountsDepart,po.depart,'' as barcode,bo.name as name,bo.price as price,bo.amount," + "po.sendTime,'' as applicant,'' as batch,dg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," - + "'' as hospitalNumber from MaterialInvoice po inner join MaterialItem bo on po.id = bo.materialInvoice_id " - + " inner join goodsStock gs on gs.id = bo.goodsStockId inner join MaterialDefinition dg on gs.materialDefinitionId = dg.id " + + "'' as hospitalNumber,po.sender,'' as assistantSender,null as expDate from " + MaterialInvoice.class.getSimpleName() + " po inner join " + + MaterialItem.class.getSimpleName() + " bo on po.id = bo.materialInvoice_id " + + " inner join " + GoodsStock.class.getSimpleName() + " gs on gs.id = bo.goodsStockId inner join " + + MaterialDefinition.class.getSimpleName() + " dg on gs.materialDefinitionId = dg.id " + "where (1=1) " + remarkCondition; if(StringUtils.isNotBlank(hospitalNumberSql)){ @@ -6906,6 +6915,9 @@ item.setSterileEndTime(rs2.getString("sterileEndTime")); item.setSterilizerName(rs2.getString("sterilizerName")); item.setSterileFrequency(rs2.getString("sterileFrequency")); + item.setSender(rs2.getString("sender")); + item.setAssistantSender(rs2.getString("assistantSender")); + item.setExpDate(rs2.getTimestamp("expDate")); summaryService.addItem(departStr, item); } } catch (SQLException e) { Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml =================================================================== diff -u -r14363 -r15297 --- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml (.../invoiceItemsQuery_main_1.jrxml) (revision 14363) +++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml (.../invoiceItemsQuery_main_1.jrxml) (revision 15297) @@ -1,5 +1,5 @@ - + @@ -80,7 +80,7 @@ - + @@ -101,21 +101,21 @@ - + - + - + @@ -129,32 +129,53 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + - + @@ -173,14 +194,14 @@ - + - + Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper =================================================================== diff -u -r14363 -r15297 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml =================================================================== diff -u -r14363 -r15297 --- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml (.../invoiceItemsQuery_child_1.jrxml) (revision 14363) +++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml (.../invoiceItemsQuery_child_1.jrxml) (revision 15297) @@ -1,7 +1,7 @@ - + - +