Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml =================================================================== diff -u -r13920 -r14530 --- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml (.../DepartmentMonthDetail.jrxml) (revision 13920) +++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml (.../DepartmentMonthDetail.jrxml) (revision 14530) @@ -1,5 +1,5 @@ - + @@ -53,7 +53,7 @@ <band height="35"> <textField> - <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1095" height="35"/> + <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1175" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -71,63 +71,63 @@ <text><![CDATA[科室]]></text> </staticText> <staticText> - <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="180" y="0" width="200" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="260" y="0" 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="380" y="0" width="70" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="460" y="0" 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="530" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="610" y="0" 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="915" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="995" y="0" 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="995" y="0" width="100" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="1075" y="0" 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="450" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="530" y="0" 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="610" y="0" width="145" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="690" y="0" 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="835" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="915" y="0" 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="755" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="835" y="0" width="80" height="34" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -140,6 +140,13 @@ </textElement> <text><![CDATA[类型]]></text> </staticText> + <staticText> + <reportElement uuid="6ed55d4f-d8a4-45f2-8a34-c0ae3e89f9aa" style="table_TH" x="180" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <text><![CDATA[外部编码]]></text> + </staticText> </band> </columnHeader> <detail> @@ -152,14 +159,14 @@ <textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression> </textField> <textField pattern="###0.0000;-###0.0000"> - <reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="995" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="1075" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression> </textField> <subreport runToBottom="false"> - <reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="895" height="35"/> + <reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="975" height="35"/> <subreportParameter name="depart"> <subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression> </subreportParameter> @@ -204,27 +211,27 @@ <textFieldExpression><![CDATA["合计"]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="450" y="0" width="545" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="530" y="0" width="545" height="35" backcolor="#FFFFFF"/> <textElement/> </textField> <textField pattern="###0.0000;-###0.0000" isBlankWhenNull="true"> - <reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="995" y="0" width="100" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="1075" y="0" width="100" height="35" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{sum_totalPrice}]]></textFieldExpression> </textField> + <textField isBlankWhenNull="true"> + <reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="360" height="35" backcolor="#FFFFFF"/> + <textElement/> + </textField> <textField pattern="###0"> - <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="380" y="0" width="70" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="460" y="0" width="70" height="35" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement uuid="e8cfb76c-c9f4-482a-a857-b6544c593d77" style="table_TH" x="100" y="0" width="280" height="35" backcolor="#FFFFFF"/> - <textElement/> - </textField> </band> </summary> </jasperReport> Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper =================================================================== diff -u -r13920 -r14530 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper =================================================================== diff -u -r13919 -r14530 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml =================================================================== diff -u -r13919 -r14530 --- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml (.../DepartmentMonthDetail_child.jrxml) (revision 13919) +++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml (.../DepartmentMonthDetail_child.jrxml) (revision 14530) @@ -1,7 +1,7 @@ <?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="895" pageHeight="700" columnWidth="895" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="518f2007-e7af-4a46-a103-ff54cdf6d701"> +<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="976" pageHeight="700" columnWidth="976" 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.x" value="22"/> <property name="ireport.y" value="0"/> <style name="table"> <box> @@ -51,6 +51,7 @@ <field name="type" class="java.lang.String"> <fieldDescription><![CDATA[type]]></fieldDescription> </field> + <field name="externalCode" class="java.lang.String"/> <variable name="totalAmount" class="java.lang.Double" calculation="Sum"> <variableExpression><![CDATA[$F{amount}]]></variableExpression> </variable> @@ -60,56 +61,56 @@ <detail> <band height="35" splitType="Stretch"> <textField> - <reportElement uuid="5675a27f-9780-42e0-a6bf-ad5a931bb845" style="table_TD" stretchType="RelativeToBandHeight" x="80" y="0" width="200" height="35"/> + <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="280" y="0" width="70" height="35"/> + <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="430" y="0" width="80" height="35"/> + <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="815" y="0" width="80" height="35"/> + <reportElement uuid="333fac08-3646-4228-886a-62068ff1e7de" style="table_TD" stretchType="RelativeToBandHeight" x="895" 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="350" y="0" width="80" height="35"/> + <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="510" y="0" width="145" height="35"/> + <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{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="735" y="0" width="80" height="35"/> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="815" 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 pattern="###0.00;-###0.00"> - <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="655" y="0" width="80" height="35"/> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="735" y="0" width="80" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -122,6 +123,13 @@ </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> </band> </detail> </jasperReport> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r14473 -r14530 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14473) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14530) @@ -4286,6 +4286,72 @@ return map; } + private Map<String, String> disposableGoodsExternalCodeMap(){ + String sql = "select name,specification,externalCode from DisposableGoods where externalCode is not null"; + ResultSet rs = objectDao.executeSql(sql); + Map<String, String> map = new HashMap<String, String>(); + try { + while(rs.next()){ + String name = rs.getString(1); + String sp = rs.getString(2); + String externalCode = rs.getString(3); + String key = name; + if(StringUtils.isNotBlank(sp)){ + key += "[" + sp + "]"; + } + map.put(key, externalCode); + + } + } catch (SQLException e) { + e.printStackTrace(); + }finally { + DatabaseUtil.closeResultSetAndStatement(rs); + } + return map; + } + + private Map<String, String> getMaterialExternalCode(){ + String sql = "select name,specification,externalCode from MaterialDefinition where externalCode is not null"; + ResultSet rs = objectDao.executeSql(sql); + Map<String, String> map = new HashMap<String, String>(); + try { + while(rs.next()){ + String name = rs.getString(1); + String sp = rs.getString(2); + String externalCode = rs.getString(3); + String key = name; + if(StringUtils.isNotBlank(sp)){ + key += "[" + sp + "]"; + } + map.put(key, externalCode); + + } + } catch (SQLException e) { + e.printStackTrace(); + }finally { + DatabaseUtil.closeResultSetAndStatement(rs); + } + return map; + } + + private Map<String, String> getTousseExternalCode(){ + String sql = "select name,externalCode from TousseDefinition where externalCode is not null"; + ResultSet rs = objectDao.executeSql(sql); + Map<String, String> map = new HashMap<String, String>(); + try { + while(rs.next()){ + String name = rs.getString(1); + String externalCode = rs.getString(2); + map.put(name, externalCode); + } + } catch (SQLException e) { + e.printStackTrace(); + }finally { + DatabaseUtil.closeResultSetAndStatement(rs); + } + return map; + } + @SuppressWarnings("unchecked") @Override public List<DepartmentMonthDetail> getDepartmentMonthDetailList( @@ -4687,6 +4753,10 @@ Map<String, List<DepartmentMonthDetailItem>> detailMap = new HashMap<String, List<DepartmentMonthDetailItem>>(); Map<String, String> manufacturerMap = getDiposableGoodsManufacturer(); + + Map<String, String> disposableGoodsExternalCodeMap = disposableGoodsExternalCodeMap(); + Map<String, String> materialExternalCodeMap = getMaterialExternalCode(); + Map<String, String> tousseExternalCodeMap = getTousseExternalCode(); ResultSet rs = objectDao.executeSql(sql); if (rs != null) { try { @@ -4735,8 +4805,12 @@ mdi.setSettlementPrice(settlementPrice); mdi.setBatchNumber(rs.getString(6)); if ("一次性物品".equals(type)) { - mdi.setManufacturer(manufacturerMap.get(goodsName + "_" - + mdi.getBatchNumber())); + mdi.setManufacturer(manufacturerMap.get(goodsName + "_" + mdi.getBatchNumber())); + mdi.setExternalCode(disposableGoodsExternalCodeMap.get(goodsName)); + }else if("材料".equals(type)){ + mdi.setExternalCode(materialExternalCodeMap.get(goodsName)); + }else{ + mdi.setExternalCode(tousseExternalCodeMap.get(goodsName)); } itemList.add(mdi); } @@ -4765,6 +4839,7 @@ item.setAmount(0); item.setPrice(0d); item.setSettlementPrice(0d); + item.setExternalCode(tousseExternalCodeMap.get(tousseName)); tmpMap.put(tousseName, item); } item.setAmount(item.getAmount()+dmi.getAmount()); @@ -4776,6 +4851,7 @@ item.setPrice(dmi.getPrice()); item.setSettlementPrice(item.getSettlementPrice() + dmi.getSettlementPrice()); item.setType(type); + item.setExternalCode(item.getExternalCode()); removeItems.add(dmi); } totalPrice += dmi.getSettlementPrice(); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java =================================================================== diff -u -r13077 -r14530 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java (.../DepartmentMonthDetailItem.java) (revision 13077) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java (.../DepartmentMonthDetailItem.java) (revision 14530) @@ -17,6 +17,8 @@ private String goodsName; + private String externalCode; + private String type; private String diposable; @@ -121,5 +123,13 @@ public void setTypeOrder(int typeOrder) { this.typeOrder = typeOrder; } + + public String getExternalCode() { + return externalCode; + } + + public void setExternalCode(String externalCode) { + this.externalCode = externalCode; + } }