Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice_child.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice_child.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice_child.jrxml (revision 25907) @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r25748 -r25907 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25748) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25907) @@ -3419,7 +3419,20 @@ } List datas = new ArrayList(); List allTousseType = getTousseTypes(typeSearch); - + // 查看是否配置显示供应商 + Boolean showSupplierNameInDetailedAccountingMonthlyReport = CssdUtils.getSystemSetConfigByNameBool("showSupplierNameInDetailedAccountingMonthlyReport", false); + String tousseDefinitionOfSupplierNameSql = "";//用器械包定义里的供应商拼接的sql语句，主要用于查询供应商和按供应商分组 + String addTousseDefinitionAtWhere = "";//拼接sql,用于添加查询TousseDefinition表 + String addJoinTousseDefinitionSql = "";//用于连接InvoiceItem和TousseDefinition + String dgbsOfSupplierNameSql = "";//用于查询DisposableGoodsBatchStock或DisposableGoodsBatch的供应商名称，主要用于查询供应商和按供应商分组 + String noQuerySupplierName = "";//不需要查询器械包名称的sql，用于连接union all连接表时保持列数不变 + if(showSupplierNameInDetailedAccountingMonthlyReport){ + tousseDefinitionOfSupplierNameSql = " ,td.supplierName "; + addTousseDefinitionAtWhere = ",TousseDefinition td "; + addJoinTousseDefinitionSql = " and td.id = ii.tousseDefinitionId "; + dgbsOfSupplierNameSql = " ,dgbs.supplierName "; + noQuerySupplierName = ",''"; + } startTime += ":00"; endTime += ":59"; // String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); @@ -3752,21 +3765,23 @@ String returnGoodsTousseType = " CASE rr.type WHEN '一次性物品' THEN (rr.type) WHEN '器械包' THEN (td.toussetype) ELSE rr.type END "; String returnGoodsTousseDefinitionId = " CASE rr.type WHEN '器械包' THEN ri.tousseDefinition_id ELSE 0 END "; //器械包 - String tousseSql = " (select i.settleAccountsDepart,ii.tousseName as name,sum(ii.amount) as amount," + String tousseSql = " (select i.settleAccountsDepart "+ tousseDefinitionOfSupplierNameSql +",ii.tousseName as name,sum(ii.amount) as amount," +"sum(ii.settlementPrice) as settlementprice,sum(ii.settlementDiscountPrice) as settlementDiscountPrice,ii.tousseType as type" + ",'' as batchNumber,null as expDate,ii.tousseDefinitionId as tousseDefinitionId from invoice i,InvoiceItem ii " + + addTousseDefinitionAtWhere + " where i.id = ii.invoice_id " + + addJoinTousseDefinitionSql + " and ii.diposable = '否' and ii.expensiveGoodsInstanceId is null and "+getHandleDeptCodeSql("i.orgUnitCoding")+" " + monthFilterSql + departFilterSql + typeFilterSql + goodsNameFilterSql - + " and i.settleaccountsdepart is not null group by i.settleAccountsDepart,ii.tousseType,ii.tousseName,ii.tousseDefinitionId)"; + + " and i.settleaccountsdepart is not null group by i.settleAccountsDepart,ii.tousseType,ii.tousseName,ii.tousseDefinitionId " + tousseDefinitionOfSupplierNameSql + ")"; //新的高值耗材(发货) String selectExpensiveGoodsSql = ""; //如果有启用高值耗材则查询 if(enableExpensiveGoods){ - selectExpensiveGoodsSql = " union all (select i.settleAccountsDepart,case when egm.model is null then eg.name else eg.name "+ concatSymbolInDb +" '[' "+ concatSymbolInDb +" egm.model "+ concatSymbolInDb +" ']' end as name,sum(ii.amount) as amount," + selectExpensiveGoodsSql = " union all (select i.settleAccountsDepart"+noQuerySupplierName+",case when egm.model is null then eg.name else eg.name "+ concatSymbolInDb +" '[' "+ concatSymbolInDb +" egm.model "+ concatSymbolInDb +" ']' end as name,sum(ii.amount) as amount," +"sum(ii.settlementPrice) as settlementprice,sum(ii.settlementDiscountPrice) as settlementDiscountPrice,ii.tousseType as type" + ",'' as batchNumber,ei.expDate as expDate,0 as tousseDefinitionId from " + Invoice.class.getSimpleName() + " i join " + InvoiceItem.class.getSimpleName()+" ii on i.id = ii.invoice_id join " + ExpensiveGoodsInstance.class.getSimpleName() @@ -3780,7 +3795,7 @@ + goodsNameFilterSql + " and i.settleaccountsdepart is not null group by i.settleAccountsDepart,ii.tousseType,case when egm.model is null then eg.name else eg.name "+ concatSymbolInDb +" '[' "+ concatSymbolInDb +" egm.model "+ concatSymbolInDb +" ']' end,ii.expensiveGoodsInstanceId,ei.expDate)"; //新的高值耗材(一键退库-即退货),如果所选物品类型为全部或高值耗材时, - selectExpensiveGoodsSql += " union all (select i.settleAccountsDepart,case when egm.model is null then eg.name else eg.name "+ concatSymbolInDb +" '[' "+ concatSymbolInDb +" egm.model "+ concatSymbolInDb +" ']' end as name,-1 * count(egi.id) as amount,-1 * sum(egi.price) settlementprice,-1 * sum(egi.price) settlementprice,'高值耗材' as type,null as batchNumber,egi.expDate,null as tousseDefinitionId " + selectExpensiveGoodsSql += " union all (select i.settleAccountsDepart "+ noQuerySupplierName+",case when egm.model is null then eg.name else eg.name "+ concatSymbolInDb +" '[' "+ concatSymbolInDb +" egm.model "+ concatSymbolInDb +" ']' end as name,-1 * count(egi.id) as amount,-1 * sum(egi.price) settlementprice,-1 * sum(egi.price) settlementprice,'高值耗材' as type,null as batchNumber,egi.expDate,null as tousseDefinitionId " + " from ExpensiveGoodsGodownEntry egge join ExpensiveGoodsGodownEntryItem eggei on egge.id=eggei.expensiveGoodsGodownEntry_id " +" join ExpensiveGoodsInstance egi on egi.id=eggei.expensiveGoodsInstanceId " +" join Invoice i on egi.invoiceId=i.id " @@ -3800,7 +3815,7 @@ diposableGoodsTousseTypeSql = String.format(" and d.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION); } if(StringUtils.isBlank(typeSearch) || "一次性物品".equals(typeSearch) || "高值耗材".equals(typeSearch) && !enableExpensiveGoods || TYPE_AUTO_DEDUCTION.equals(typeSearch)){ - diposableGoodsSql = " union all (select i.settleaccountsdepart,d.name as name,sum(d.amount) as amount," + diposableGoodsSql = " union all (select i.settleaccountsdepart "+ dgbsOfSupplierNameSql +",d.name as name,sum(d.amount) as amount," +"sum(d.fluctuationPrice*d.amount) as settlementprice,sum(d.fluctuationPrice*d.amount) as settlementDiscountPrice,'一次性物品' as type" + ",d.batch as batchNumber,dgbs.expDate,0 as tousseDefinitionId from invoice i,DiposableGoodsItem d," + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs " + " where i.id = d.invoice_id and d.disposableGoodsBatchStockID=dgbs.id and "+getHandleDeptCodeSql("i.orgUnitCoding")+" " @@ -3810,12 +3825,12 @@ + departFilterSql + nameFilterSql + expensiveDisposablegoodsSql - + " group by i.settleaccountsdepart,d.name,d.batch,dgbs.expDate) "; + + " group by i.settleaccountsdepart,d.name,d.batch,dgbs.expDate "+ dgbsOfSupplierNameSql +") "; } String packingDisposableGoodsSql = " "; { if(StringUtils.isBlank(typeSearch) || "一次性物品".equals(typeSearch)){ - packingDisposableGoodsSql = " union all (select pr.orgUnitName,dgi.name as name,sum(dgi.amount) as amount," + packingDisposableGoodsSql = " union all (select pr.orgUnitName "+ dgbsOfSupplierNameSql +",dgi.name as name,sum(dgi.amount) as amount," +"sum(dgi.fluctuationPrice*dgi.amount) as settlementprice,sum(dgi.fluctuationPrice*dgi.amount) as settlementDiscountPrice,'一次性物品' as type" + ",dgi.batch as batchNumber,dgbs.expDate,0 as tousseDefinitionId from PackingRecord pr inner join DiposableGoodsItem dgi on pr.id = dgi.packingRecordId " + " inner join " + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs on dgi.disposableGoodsBatchStockID=dgbs.id" @@ -3825,7 +3840,7 @@ + packingDisposableGoodsDepartSql + packingDisposableGoodsNameSql // + expensiveDisposablegoodsSql - + " group by pr.orgUnitName,dgi.name,dgi.batch,dgbs.expDate) "; + + " group by pr.orgUnitName,dgi.name,dgi.batch,dgbs.expDate "+ dgbsOfSupplierNameSql +") "; } } @@ -3837,7 +3852,7 @@ if(StringUtils.isBlank(batch)){ if ((StringUtils.isBlank(typeSearch) || "器械材料".equals(typeSearch) || "高值耗材".equals(typeSearch))) { // 材料发货 - materialInvoiceSql = " union all (select i.settleAccountsDepart,ii.materialName,sum(ii.amount),sum(ii.settlementPrice)," + materialInvoiceSql = " union all (select i.settleAccountsDepart "+ noQuerySupplierName +",ii.materialName,sum(ii.amount),sum(ii.settlementPrice)," +"sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId " + " from MaterialInvoice i," + "MaterialInvoiceItem ii,materialDefinition d where i.id = ii.materialInvoice_id " @@ -3849,7 +3864,7 @@ + " group by i.settleaccountsdepart,ii.materialName) "; } // 材料退货 - materialReturnSql = " union all (select rr.depart as settleaccountsdepart,ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice)," + materialReturnSql = " union all (select rr.depart as settleaccountsdepart "+ noQuerySupplierName+",ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice)," +"-sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId " + " from ReturnMaterialRecord rr,materialDefinition d," + "ReturnMaterialItem ii where rr.id = ii.returnMaterialRecord_ID " @@ -3860,19 +3875,19 @@ + materialTypeFilterSql + " group by rr.depart,ii.materialName) "; - lostMaterial = " union all (select r.depart,r.materialName,sum(r.additionalAmount),sum(r.additionalAmount * r.materialCost)," + lostMaterial = " union all (select r.depart "+noQuerySupplierName+",r.materialName,sum(r.additionalAmount),sum(r.additionalAmount * r.materialCost)," +"sum(r.additionalAmount * r.materialCost) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId " + " from MaterialErrorDamageDetail r left join materialDefinition m on r.materialDefinitionId = m.id where 1=1 and r.errorType = '缺失' and r.type = '"+MaterialErrorDamageDetail.TYPE_ERROR+"' and r.materialName != '器械包标识牌' and r.additionalAmount > 0 and "+getHandleDeptCodeSql("r.handleDepartCode")+" " + lostMaterialFilterSql + "group by r.depart,r.materialName ) "; - damageMaterial = " union all (select i.depart,i.materialName,sum(i.additionalAmount),sum(i.materialCost*i.additionalAmount)," + damageMaterial = " union all (select i.depart"+noQuerySupplierName+",i.materialName,sum(i.additionalAmount),sum(i.materialCost*i.additionalAmount)," +"sum(i.materialCost*i.additionalAmount) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId " + "from MaterialErrorDamageDetail i left join materialDefinition m on i.materialDefinitionId = m.id where 1=1 " + "and i.type = '" + MaterialErrorDamageDetail.TYPE_DAMAGE + "' and i.additionalAmount > 0 and "+getHandleDeptCodeSql("i.handleDepartCode")+" " + damageFilterSql + " group by i.departCode,i.depart,i.materialName ) "; } //退货(一次性物品、器械包) - String returnGoodsSql = " union all (select rr.depart as settleaccountsdepart,ri.toussename as name," + String returnGoodsSql = " union all (select rr.depart as settleaccountsdepart"+dgbsOfSupplierNameSql+",ri.toussename as name," + "-sum(ri.amount) as amount,-sum(ri.settlementPrice) as settlementprice,-sum(ri.settlementPrice) as settlementDiscountPrice," +returnGoodsTousseType+" as type" + ",ri.batchNumber as batchNumber,dgbs.expDate,"+returnGoodsTousseDefinitionId+" as tousseDefinitionId from " + ReturnGoodsRecord.class.getSimpleName() + " rr inner join " @@ -3882,36 +3897,36 @@ + " where " + getHandleDeptCodeSql("rr.handleDepartCode")+" " + returnGoodsFilterSql +" and "+returnGoodsItemPredicate - + " group by rr.depart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber,dgbs.expDate,"+returnGoodsTousseDefinitionId+") "; + + " group by rr.depart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber,dgbs.expDate,"+returnGoodsTousseDefinitionId+ dgbsOfSupplierNameSql +") "; String supplyRoomTousseTypeSql = ""; if(TYPE_AUTO_DEDUCTION.equals(typeSearch)){ supplyRoomTousseTypeSql = String.format(" and rr.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION); } - String supplyRoomDiposableGoodsSql = " union all (select rr.depart as settleaccountsdepart,rri.goodsName,sum(rri.amount)," - +"sum(rri.price*rri.amount) as settlementprice,sum(rri.price*rri.amount) as settlementDiscountPrice,rri.type as type,dbs.batchNumber as batchNumber,dbs.expDate,0 as tousseDefinitionId " - +" from ReceiveRecord rr,ReceiveRecordItem rri left join " + DisposableGoodsBatchStock.class.getSimpleName() + " dbs " - +" on rri.diposableGoodBatchStock_id = dbs.id left join DisposableGoods d on d.id = rri.disposableGoodsId where rr.id = rri.receiveRecord_id and "+getHandleDeptCodeSql("rr.departCoding")+" " + String supplyRoomDiposableGoodsSql = " union all (select rr.depart"+ dgbsOfSupplierNameSql +" as settleaccountsdepart,rri.goodsName,sum(rri.amount)," + +"sum(rri.price*rri.amount) as settlementprice,sum(rri.price*rri.amount) as settlementDiscountPrice,rri.type as type,dgbs.batchNumber as batchNumber,dgbs.expDate,0 as tousseDefinitionId " + +" from ReceiveRecord rr,ReceiveRecordItem rri left join " + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs " + +" on rri.diposableGoodBatchStock_id = dgbs.id left join DisposableGoods d on d.id = rri.disposableGoodsId where rr.id = rri.receiveRecord_id and "+getHandleDeptCodeSql("rr.departCoding")+" " +supplyRoomDiposableGoodsFilterSql +supplyRoomTousseTypeSql +" and "+receiveRecordItemPredicate - + " group by rr.depart,rri.goodsName,rri.amount,rri.type,dbs.batchNumber,dbs.expDate) "; + + " group by rr.depart,rri.goodsName,rri.amount,rri.type,dgbs.batchNumber,dgbs.expDate "+ dgbsOfSupplierNameSql +") "; // 调拨出库 - String appropriateOutDiposableGoodsSql = " union all (select oge.targetOrgUnitName as settleaccountsdepart,ged.goodsName,sum(ged.amount)," - +"sum(ged.price*ged.amount) as settlementprice,sum(ged.price*ged.amount) as settlementDiscountPrice,'一次性物品' as type,dgb.batchNumber as batchNumber,dgb.expDate,0 as tousseDefinitionId " - +" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id inner join DisposableGoods dg on dgb.diposablegoods_id = dg.id " + String appropriateOutDiposableGoodsSql = " union all (select oge.targetOrgUnitName as settleaccountsdepart"+dgbsOfSupplierNameSql+",ged.goodsName,sum(ged.amount)," + +"sum(ged.price*ged.amount) as settlementprice,sum(ged.price*ged.amount) as settlementDiscountPrice,'一次性物品' as type,dgbs.batchNumber as batchNumber,dgbs.expDate,0 as tousseDefinitionId " + +" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgbs on ged.disposableGoodsBatchID=dgbs.id inner join DisposableGoods dg on dgbs.diposablegoods_id = dg.id " +" where oge.type ='退库单' and oge.subType='调拨出库' and "+getHandleDeptCodeSql("oge.orgUnitCode")+" " +outEntryFilterSql +" and "+outEntryPredicate - + " group by oge.targetOrgUnitName, ged.goodsName,dgb.batchNumber,dgb.expDate) "; + + " group by oge.targetOrgUnitName, ged.goodsName,dgbs.batchNumber,dgbs.expDate "+ dgbsOfSupplierNameSql +") "; // 盘亏出库 - String stocktakeOutDiposableGoodsSql = " union all (select oge.orgUnitName as settleaccountsdepart,ged.goodsName,sum(ged.amount)," - +"sum(ged.price*ged.amount) as settlementprice,sum(ged.price*ged.amount) as settlementDiscountPrice,'一次性物品' as type,dgb.batchNumber as batchNumber,dgb.expDate,0 as tousseDefinitionId " - +" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id inner join DisposableGoods dg on dgb.diposablegoods_id = dg.id " + String stocktakeOutDiposableGoodsSql = " union all (select oge.orgUnitName"+dgbsOfSupplierNameSql+" as settleaccountsdepart,ged.goodsName,sum(ged.amount)," + +"sum(ged.price*ged.amount) as settlementprice,sum(ged.price*ged.amount) as settlementDiscountPrice,'一次性物品' as type,dgbs.batchNumber as batchNumber,dgbs.expDate,0 as tousseDefinitionId " + +" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgbs on ged.disposableGoodsBatchID=dgbs.id inner join DisposableGoods dg on dgbs.diposablegoods_id = dg.id " +" where oge.type ='退库单' and oge.subType='盘亏出库' and "+getHandleDeptCodeSql("oge.orgUnitCode")+" " +outEntryFilterSql +" and "+outEntryPredicate - + " group by oge.orgUnitName, ged.goodsName,dgb.batchNumber,dgb.expDate) "; + + " group by oge.orgUnitName, ged.goodsName,dgbs.batchNumber,dgbs.expDate"+dgbsOfSupplierNameSql+") "; String sql = tousseSql + selectExpensiveGoodsSql + diposableGoodsSql + supplyRoomDiposableGoodsSql ; @@ -3984,6 +3999,13 @@ if(totalAmount != 0){ price = MathTools.divide(settlementPrice, totalAmount, 4); } + if(showSupplierNameInDetailedAccountingMonthlyReport){ + if(TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(type) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(type) + || DisposableGoods.TYPE_NAME.equals(type)){ + String supplierName = rs.getString("supplierName"); + mdi.setSupplierName(supplierName); + } + } mdi.setPrice(price); mdi.setAmount(totalAmount); mdi.setGoodsName(goodsName); @@ -4183,7 +4205,16 @@ String tousseGroupName = StringTools.defaultIfEmpty(requestParams.get("tousseGroupName"),"全部"); String invoiceDepartGroup = StringTools.defaultIfEmpty(requestParams.get("invoiceDepartGroup"),"all"); boolean enableExpensiveGoods = CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods"); - + //是否查询并显示发货物品查询报表一次性物品和外来器械的供应商。true:显示;false,默认:不查询显示 + boolean showSupplierNameInInvoiceItemQueryReport = CssdUtils.getSystemSetConfigByNameBool("showSupplierNameInInvoiceItemQueryReport", false); + String querySupplierNameOfTousseDefinition = "";//查询器械包定义的供应商，用于拼接sql + String noQuerySupplierName = "";//不查询供应商，用于拼接sql,使union all列数一致 + String querySupplierNameOfDisposableGoodsBatchStock = "";//查询DisposableGoodsBatchStock的供应商，用于拼接sql + if(showSupplierNameInInvoiceItemQueryReport){ + querySupplierNameOfTousseDefinition = ",td.supplierName"; + noQuerySupplierName = ",''"; + querySupplierNameOfDisposableGoodsBatchStock = ",dgbs.supplierName"; + } String tousseTypeSql = " 1=1 "; String disposableTypeSql = " 1=1 "; String materialTypeSql = " 1=1 "; @@ -4282,31 +4313,31 @@ String tousseAmount = " case td.toussetype when '"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"' then " + cumstomTousseAmount + " when '"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"' then case when m.mcount is null then 1 else m.mcount end else 1 end "; String sql = " "; - String tousseSql = "select '器械包' as type,po.orgUnitCoding,po.settleAccountsDepart,po.departCoding,po.depart,do.barcode,bo.tousseName as name," + String tousseSql = "select '器械包' as type"+querySupplierNameOfTousseDefinition+",po.orgUnitCoding,po.settleAccountsDepart,po.departCoding,po.depart,do.barcode,bo.tousseName as name," + tousseAmount + " as amount,bo.price as totalPrice,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,po.sender,po.assistantSender,bo.validUntil as expDate from " + Invoice.class.getSimpleName() + " po inner join " + TousseInstance.class.getSimpleName() + " bo on po.id = bo.invoice_id " + " inner join " + BarcodeDevice.class.getSimpleName()+ " do on bo.id = do.id" + " inner join " + TousseDefinition.class.getSimpleName() + " td on bo.tousseDefinition_id=td.id " + " left join (" + tousseMaterialAmount + " ) m on m.id = td.id" +" where 1=1 " + tousseGroupNameSql + remarkCondition + hospitalNumberSql + " and " + tousseTypeSql; - String diposableSql = "select '一次性物品' as type,po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,case when bo.expensiveDGBarcode is null then bo.barcode else bo.expensiveDGBarcode end barcode,bo.name,bo.amount,bo.price*bo.amount as totalPrice," + String diposableSql = "select '一次性物品' as type "+querySupplierNameOfDisposableGoodsBatchStock+",po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,case when bo.expensiveDGBarcode is null then bo.barcode else bo.expensiveDGBarcode end barcode,bo.name,bo.amount,bo.price*bo.amount as totalPrice," + "po.sendTime,po.applicant,bo.batch,dg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," + "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 + " and " + disposableTypeSql; - String expensiveGoods = "select '高值耗材' as type,po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,bd.barcode barcode,ii.tousseName name,ii.amount,ii.settlementPrice as totalPrice," + String expensiveGoods = "select '高值耗材' as type"+noQuerySupplierName+",po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,bd.barcode barcode,ii.tousseName name,ii.amount,ii.settlementPrice as totalPrice," + "po.sendTime,po.applicant,'' batch,eg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," + "po.hospitalNumber as hospitalNumber,po.sender,po.assistantSender,ei.expDate from " + Invoice.class.getSimpleName() + " po join " + InvoiceItem.class.getSimpleName()+" ii on ii.invoice_id = po.id" + " join " + ExpensiveGoodsInstance.class.getSimpleName() + " ei on ei.id = ii.expensiveGoodsInstanceId join "+ BarcodeDevice.class.getSimpleName() +" bd on bd.id = ei.id" + " join " + ExpensiveGoods.class.getSimpleName() + " eg on eg.id = ei.expensiveGoods_id" + " where (1=1) " + remarkCondition + hospitalNumberSql + " and " + expensiveGoodsSql; - String materialSql = "select '材料' as type,po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,'' as barcode,bo.name as name,bo.amount,bo.price*bo.amount as totalPrice," + String materialSql = "select '材料' as type"+noQuerySupplierName+",po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,'' as barcode,bo.name as name,bo.amount,bo.price*bo.amount as totalPrice," + "po.sendTime,'' as applicant,'' as batch,dg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," + "'' 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 " @@ -4355,8 +4386,10 @@ try { while (rs2.next()) { InvoiceQueryItem item = new InvoiceQueryItem(); - String departStr = rs2.getString("settleAccountsDepart"); + if(showSupplierNameInInvoiceItemQueryReport){ + item.setSupplierName(rs2.getString("supplierName")); + } item.setBarcode(rs2.getString("barcode")); item.setGoodsName(rs2.getString("name")); item.setAmount(rs2.getInt("amount")); Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jrxml (revision 25907) @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js =================================================================== diff -u -r23655 -r25907 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 23655) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 25907) @@ -53,9 +53,19 @@ removeMask: true }); myMask.show(); - + var jasperreportNameOfsummaryType = "invoiceSummaryQuery_main.jasper";//发货汇总的jasperreportName + var jasperreportNameOfDetailedType = "invoiceItemsQuery_main_1.jasper";//发货明细的jasperreportName + //获取配置是否查询显示供应商，默认false：不查询隐藏供应商 + var showSupplierNameInInvoiceItemQueryReport = false; + if(sstsConfig.hasOwnProperty('showSupplierNameInInvoiceItemQueryReport') && sstsConfig.showSupplierNameInInvoiceItemQueryReport){ + showSupplierNameInInvoiceItemQueryReport = true; + } + if(showSupplierNameInInvoiceItemQueryReport){//有供应商的发货物品查询报表jasperreportName + jasperreportNameOfsummaryType = "invoiceSummaryQuery_mainAddSupplierName.jasper"; + jasperreportNameOfDetailedType = "invoiceItemsQuery_main_1AddSupplierName.jasper"; + } if(summaryType == "发货汇总"){ - window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=invoiceSummaryQuery_main.jasper&reportName=invoiceSummaryQuery&depart=" + window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfsummaryType+"&reportName=invoiceSummaryQuery&depart=" + departSearch+ "&settleDepartSearch=" + settleDepartSearch +"&startDate=" + startDate + "&endDate=" +endDate + "&applicant=" + applicant + "&goodsName=" +goodsName + "&hasRemark=" +hasRemark @@ -64,7 +74,7 @@ + "&batchNumber=" + batchNumber + "&hospitalNumber=" +　hospitalNumber + "&tousseGroupName=" + tousseGroupName + "&invoiceDepartGroup=" + invoiceDepartGroup, 'thisIframe', '_self'); }else{ - window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=invoiceItemsQuery_main_1.jasper&reportName=invoiceQuery&depart=" + window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportNameOfDetailedType+"&reportName=invoiceQuery&depart=" + departSearch+ "&settleDepartSearch=" + settleDepartSearch +"&startDate=" + startDate + "&endDate=" +endDate + "&applicant=" + applicant + "&goodsName=" +goodsName + "&hasRemark=" +hasRemark Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml =================================================================== diff -u -r14514 -r25907 --- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 14514) +++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 25907) @@ -1,5 +1,5 @@ - + @@ -65,7 +65,7 @@ <band height="40" splitType="Stretch"> <textField> - <reportElement uuid="ce082913-c8ef-4023-8402-b5fd3866b227" x="0" y="0" width="1100" height="40"/> + <reportElement uuid="ce082913-c8ef-4023-8402-b5fd3866b227" x="0" y="0" width="3100" height="40"/> <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -76,7 +76,7 @@ <summary> <band height="138" splitType="Stretch"> <crosstab> - <reportElement uuid="c67f52ad-a7f8-4da3-9f11-b30f1228b1ab" x="0" y="0" width="1100" height="88"/> + <reportElement uuid="c67f52ad-a7f8-4da3-9f11-b30f1228b1ab" x="0" y="0" width="3100" height="88"/> <crosstabHeaderCell> <cellContents> <staticText> Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js =================================================================== diff -u -r25194 -r25907 --- ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js (.../config.js) (revision 25194) +++ ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js (.../config.js) (revision 25907) @@ -81,5 +81,9 @@ //是否允许回收数量减小的部分超过待装配数量 allowDecreaseRecyclingAmountGreatUnPackingAmount: true, //是否在个人桌面显示外部代理灭菌的图标 - showForeignProxySterilizationDesktopIcon:true + showForeignProxySterilizationDesktopIcon:true, + //是否查询并显示明细核算月报一次性物品和外来器械的供应商。true:显示;false,默认:不查询显示 + showSupplierNameInDetailedAccountingMonthlyReport : true, + //是否查询并显示发货物品查询报表一次性物品和外来器械的供应商。true:显示;false,默认:不查询显示 + showSupplierNameInInvoiceItemQueryReport : true } \ No newline at end of file Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java =================================================================== diff -u -r17020 -r25907 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java (.../DepartmentMonthDetailItem.java) (revision 17020) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java (.../DepartmentMonthDetailItem.java) (revision 25907) @@ -38,6 +38,10 @@ private String expDate; private int typeOrder = ORDER_TOUSSE; + /** + * 供应商 主要显示一次性物品和外来器械的供应商 + */ + private String supplierName; public String getGoodsName() { return goodsName; @@ -141,5 +145,13 @@ public void setExternalCode(String externalCode) { this.externalCode = externalCode; } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } } Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jasper =================================================================== diff -u Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java =================================================================== diff -u -r25160 -r25907 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 25160) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java (.../InvoiceQueryItem.java) (revision 25907) @@ -87,7 +87,11 @@ * 单位(针对GGSRMYY-51 增加一次性物品发放表新增字段) */ private String unit; - + /** + * 供应商 主要显示一次性物品和外来器械的供应商 + */ + private String supplierName; + public String getExternalCode() { return externalCode; } @@ -254,4 +258,12 @@ this.sequence = sequence; } + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + } Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml (revision 25907) @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="monthDetail_main_1" language="groovy" pageWidth="941" pageHeight="792" whenNoDataType="AllSectionsNoDetail" columnWidth="941" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444"> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <style name="table"> + <box> + <pen lineWidth="1.0" lineColor="#000000"/> + </box> + </style> + <style name="table_TH" mode="Opaque" backcolor="#F0F8FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_CH" mode="Opaque" backcolor="#BFE1FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_TD" mode="Opaque" backcolor="#FFFFFF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <subDataset name="Table Dataset 1" uuid="11526d02-b294-4d96-bde0-a51b05c04838"/> + <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> + <defaultValueExpression><![CDATA["C:\\Users\\wang\\"]]></defaultValueExpression> + </parameter> + <queryString> + <![CDATA[]]> + </queryString> + <field name="depart" class="java.lang.String"> + <fieldDescription><![CDATA[depart]]></fieldDescription> + </field> + <field name="queryItems" class="java.util.List"> + <fieldDescription><![CDATA[queryItems]]></fieldDescription> + </field> + <field name="serialNum" class="java.lang.Integer"> + <fieldDescription><![CDATA[serialNum]]></fieldDescription> + </field> + <background> + <band splitType="Stretch"/> + </background> + <columnHeader> + <band height="72" splitType="Stretch"> + <staticText> + <reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="226" y="41" width="201" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[物品名称]]></text> + </staticText> + <staticText> + <reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="721" y="41" width="94" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[数量]]></text> + </staticText> + <staticText> + <reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="815" y="41" width="126" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[金额]]></text> + </staticText> + <staticText> + <reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="0" y="41" width="100" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[科室]]></text> + </staticText> + <staticText> + <reportElement uuid="ce90b97b-e553-4841-bccb-f3abc32699df" style="table_TH" x="628" y="41" width="93" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true"/> + </textElement> + <text><![CDATA[单价]]></text> + </staticText> + <staticText> + <reportElement uuid="6d040844-4c27-4006-975e-a547302162d0" x="0" y="0" width="941" height="41"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="16" isBold="true"/> + </textElement> + <text><![CDATA[发货物品查询]]></text> + </staticText> + <staticText> + <reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="100" y="41" width="126" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[外部编码]]></text> + </staticText> + <staticText> + <reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="427" y="41" width="201" height="31" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="14" isBold="true" isItalic="false"/> + </textElement> + <text><![CDATA[供应商]]></text> + </staticText> + </band> + </columnHeader> + <detail> + <band height="35" splitType="Stretch"> + <subreport> + <reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="100" y="0" width="841" height="35" isPrintWhenDetailOverflows="true"/> + <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{queryItems})]]></dataSourceExpression> + <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "invoiceSummaryQuery_childAddSupplierName.jasper"]]></subreportExpression> + </subreport> + <textField> + <reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="12" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression> + </textField> + </band> + </detail> + <columnFooter> + <band splitType="Stretch"/> + </columnFooter> + <pageFooter> + <band height="20" splitType="Stretch"> + <textField> + <reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="786" y="0" width="70" height="20"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA["第"+$V{PAGE_NUMBER}+"页"]]></textFieldExpression> + </textField> + <textField evaluationTime="Report"> + <reportElement uuid="d06f5aae-be69-49e1-b31d-cc92cb7b3cc1" x="856" y="0" width="85" height="20"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA["共"+$V{PAGE_NUMBER}+"页"]]></textFieldExpression> + </textField> + </band> + </pageFooter> +</jasperReport> Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jrxml (revision 25907) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="monthDetail_child_1" language="groovy" pageWidth="841" pageHeight="842" columnWidth="841" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3"> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <style name="table"> + <box> + <pen lineWidth="1.0" lineColor="#000000"/> + </box> + </style> + <style name="table_TH" mode="Opaque" backcolor="#F0F8FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_CH" mode="Opaque" backcolor="#BFE1FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_TD" mode="Opaque" backcolor="#FFFFFF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <subDataset name="Table Dataset 1" uuid="d5f6cd75-27c2-46f8-9850-7487a3b2eb3c"/> + <parameter name="depart" class="java.lang.String"/> + <parameter name="tousse" class="java.lang.String"> + <defaultValueExpression><![CDATA[""]]></defaultValueExpression> + </parameter> + <parameter name="goods" class="java.lang.String"> + <defaultValueExpression><![CDATA[""]]></defaultValueExpression> + </parameter> + <queryString> + <![CDATA[]]> + </queryString> + <field name="amount" class="java.lang.Integer"> + <fieldDescription><![CDATA[amount]]></fieldDescription> + </field> + <field name="applicant" class="java.lang.String"> + <fieldDescription><![CDATA[applicant]]></fieldDescription> + </field> + <field name="barcode" class="java.lang.String"> + <fieldDescription><![CDATA[barcode]]></fieldDescription> + </field> + <field name="batch" class="java.lang.String"> + <fieldDescription><![CDATA[batch]]></fieldDescription> + </field> + <field name="class" class="java.lang.Class"> + <fieldDescription><![CDATA[class]]></fieldDescription> + </field> + <field name="externalCode" class="java.lang.String"> + <fieldDescription><![CDATA[externalCode]]></fieldDescription> + </field> + <field name="goodsName" class="java.lang.String"> + <fieldDescription><![CDATA[goodsName]]></fieldDescription> + </field> + <field name="price" class="java.lang.Double"> + <fieldDescription><![CDATA[price]]></fieldDescription> + </field> + <field name="time" class="java.lang.String"> + <fieldDescription><![CDATA[time]]></fieldDescription> + </field> + <field name="totalPrice" class="java.lang.Double"> + <fieldDescription><![CDATA[totalPrice]]></fieldDescription> + </field> + <field name="supplierName" class="java.lang.String"> + <fieldDescription><![CDATA[supplierName]]></fieldDescription> + </field> + <detail> + <band height="35" splitType="Stretch"> + <textField> + <reportElement uuid="14e1d26b-1d27-49c8-92b4-b27135f799c2" style="table_TD" x="126" y="0" width="201" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{goodsName}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="b950364c-8d9e-4aa6-9617-22dd9ef34559" style="table_TD" x="621" y="0" width="94" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression> + </textField> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="d74e31c5-06b2-4162-8248-5b81b9f50f33" style="table_TD" x="528" y="0" width="93" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{price}==null?"0.0000":$F{price}]]></textFieldExpression> + </textField> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="632c2866-aaf6-4859-b83f-7b3dc2cfc4d6" style="table_TD" x="715" y="0" width="126" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{totalPrice}==null?"0.0000":$F{totalPrice}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="14e1d26b-1d27-49c8-92b4-b27135f799c2" style="table_TD" x="0" y="0" width="126" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{externalCode}==null?"":$F{externalCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="14e1d26b-1d27-49c8-92b4-b27135f799c2" style="table_TD" x="327" y="0" width="201" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression> + </textField> + </band> + </detail> +</jasperReport> Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jrxml (revision 25907) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DepartmentMonthDetail_child" language="groovy" pageWidth="1040" pageHeight="700" columnWidth="1040" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="518f2007-e7af-4a46-a103-ff54cdf6d701"> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <style name="table"> + <box> + <pen lineWidth="1.0" lineColor="#000000"/> + </box> + </style> + <style name="table_TH" mode="Opaque" backcolor="#F0F8FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_CH" mode="Opaque" backcolor="#BFE1FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_TD" mode="Opaque" backcolor="#FFFFFF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <parameter name="depart" class="java.lang.String"/> + <queryString> + <![CDATA[]]> + </queryString> + <field name="settlementPrice" class="java.lang.Double"> + <fieldDescription><![CDATA[settlementPrice]]></fieldDescription> + </field> + <field name="manufacturer" class="java.lang.String"> + <fieldDescription><![CDATA[manufacturer]]></fieldDescription> + </field> + <field name="price" class="java.lang.Double"> + <fieldDescription><![CDATA[price]]></fieldDescription> + </field> + <field name="batchNumber" class="java.lang.String"> + <fieldDescription><![CDATA[batchNumber]]></fieldDescription> + </field> + <field name="goodsName" class="java.lang.String"> + <fieldDescription><![CDATA[goodsName]]></fieldDescription> + </field> + <field name="amount" class="java.lang.Integer"> + <fieldDescription><![CDATA[amount]]></fieldDescription> + </field> + <field name="expDate" class="java.lang.String"> + <fieldDescription><![CDATA[expDate]]></fieldDescription> + </field> + <field name="type" class="java.lang.String"> + <fieldDescription><![CDATA[type]]></fieldDescription> + </field> + <field name="externalCode" class="java.lang.String"/> + <field name="supplierName" class="java.lang.String"> + <fieldDescription><![CDATA[supplierName]]></fieldDescription> + </field> + <variable name="totalAmount" class="java.lang.Double" calculation="Sum"> + <variableExpression><![CDATA[$F{amount}]]></variableExpression> + </variable> + <background> + <band splitType="Stretch"/> + </background> + <detail> + <band height="35" splitType="Stretch"> + <textField> + <reportElement uuid="5675a27f-9780-42e0-a6bf-ad5a931bb845" style="table_TD" stretchType="RelativeToBandHeight" x="160" y="0" width="200" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{goodsName}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="0bf156d3-7fc1-45bc-9252-2f3a44b09781" style="table_TD" stretchType="RelativeToBandHeight" x="360" y="0" width="70" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression> + </textField> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="510" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{price}]]></textFieldExpression> + </textField> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="333fac08-3646-4228-886a-62068ff1e7de" style="table_TD" stretchType="RelativeToBandHeight" x="960" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{settlementPrice}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="430" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{batchNumber} == null?"":$F{batchNumber}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="735" y="0" width="145" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{manufacturer}==null?"":$F{manufacturer}]]></textFieldExpression> + </textField> + <textField pattern="###0.00;-###0.00"> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="880" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{expDate}==null?"":$F{expDate}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="5675a27f-9780-42e0-a6bf-ad5a931bb845" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{type}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="9a3bc7e7-7a3e-475e-809a-69b429a6542e" style="table_TD" x="80" y="0" width="80" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{externalCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="590" y="0" width="145" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression> + </textField> + </band> + </detail> +</jasperReport> Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName.jrxml (revision 25907) @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DepartmentMonthDetail" language="groovy" pageWidth="1240" pageHeight="875" columnWidth="1240" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="701ff2f7-7ef5-4278-be9c-7a914bd1521b"> + <property name="ireport.zoom" value="0.75"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <style name="table"> + <box> + <pen lineWidth="1.0" lineColor="#000000"/> + </box> + </style> + <style name="table_TH" mode="Opaque" backcolor="#F0F8FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_CH" mode="Opaque" backcolor="#BFE1FF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <style name="table_TD" mode="Opaque" backcolor="#FFFFFF"> + <box> + <pen lineWidth="0.5" lineColor="#000000"/> + </box> + </style> + <subDataset name="Table Dataset 1" uuid="1947ebb7-e9ff-4cf6-a6c8-09bd90c331ba"/> + <parameter name="title" class="java.lang.String"/> + <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> + <defaultValueExpression><![CDATA["D:\\TDDOWNLOAD\\报表\\"]]></defaultValueExpression> + </parameter> + <queryString> + <![CDATA[]]> + </queryString> + <field name="depart" class="java.lang.String"> + <fieldDescription><![CDATA[depart]]></fieldDescription> + </field> + <field name="totalPrice" class="java.lang.Double"> + <fieldDescription><![CDATA[totalPrice]]></fieldDescription> + </field> + <field name="items" class="java.util.List"> + <fieldDescription><![CDATA[items]]></fieldDescription> + </field> + <variable name="sum_amount" class="java.lang.Double" calculation="Sum"> + <initialValueExpression><![CDATA[0]]></initialValueExpression> + </variable> + <variable name="sum_totalPrice" class="java.lang.Double" calculation="Sum"> + <variableExpression><![CDATA[$F{totalPrice}]]></variableExpression> + <initialValueExpression><![CDATA[0]]></initialValueExpression> + </variable> + <background> + <band splitType="Stretch"/> + </background> + <title> + <band height="69"> + <textField> + <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="1" y="0" width="1095" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="71b10d1c-6970-4e43-85ca-f94c3e1ce2a1" style="table_TH" x="0" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[科室]]></text> + </staticText> + <staticText> + <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="260" y="35" width="200" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[物品名称]]></text> + </staticText> + <staticText> + <reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="460" y="35" width="70" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[数量]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="610" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[单价（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="1060" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[总计（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="1140" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[总价（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="530" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[批次]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="835" y="35" width="145" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[生产厂家]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="980" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[失效期]]></text> + </staticText> + <staticText> + <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[类型]]></text> + </staticText> + <staticText> + <reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="180" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[外部编码]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="690" y="35" width="145" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[供应商]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jrxml (revision 25907) @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper =================================================================== diff -u -r14514 -r25907 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice_child.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r23941 -r25907 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 23941) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 25907) @@ -54,8 +54,18 @@ } myMask.show(); var jasperreportFileName = "DepartmentMonthDetail.jasper"; - if(sstsConfig.enableDiscountPrice){ + //获取配置是否查询显示供应商，默认false：不查询隐藏供应商 + var showSupplierNameInDetailedAccountingMonthlyReport = false; + if(sstsConfig.hasOwnProperty('showSupplierNameInDetailedAccountingMonthlyReport') && sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport){ + showSupplierNameInDetailedAccountingMonthlyReport = true; + } + var enableDiscountPrice = sstsConfig.enableDiscountPrice; + if(enableDiscountPrice && showSupplierNameInDetailedAccountingMonthlyReport){//价格供应商都显示 + jasperreportFileName = "DepartmentMonthDetailSupplierNameAndDiscountPrice.jasper"; + }else if(enableDiscountPrice){//显示价格 jasperreportFileName = "DepartmentMonthDetailDiscountPrice.jasper"; + }else if(showSupplierNameInDetailedAccountingMonthlyReport){//查询显示供应商 + jasperreportFileName = "DepartmentMonthDetailSupplierName.jasper"; } /*window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?" + "reportName=departmentMonthDetail&jasperreportName=" + jasperreportFileName Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml (revision 25907) @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="69"> + <textField> + <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="1" y="0" width="1294" height="35"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="71b10d1c-6970-4e43-85ca-f94c3e1ce2a1" style="table_TH" x="0" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[科室]]></text> + </staticText> + <staticText> + <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="260" y="35" width="200" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[物品名称]]></text> + </staticText> + <staticText> + <reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="460" y="35" width="70" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[数量]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="610" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[单价（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="1060" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[总计（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="1240" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[总价（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="530" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[批次]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="835" y="35" width="145" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[生产厂家]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="980" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[失效期]]></text> + </staticText> + <staticText> + <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[类型]]></text> + </staticText> + <staticText> + <reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="180" y="35" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[外部编码]]></text> + </staticText> + <staticText> + <reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="1140" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[折扣总计（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="1340" y="35" width="100" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[折扣总价（元）]]></text> + </staticText> + <staticText> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="690" y="35" width="145" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[供应商]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +