Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml =================================================================== diff -u -r13450 -r13919 --- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml (.../DepartmentMonthDetail.jrxml) (revision 13450) +++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml (.../DepartmentMonthDetail.jrxml) (revision 13919) @@ -1,5 +1,5 @@ - + @@ -53,7 +53,7 @@ <band height="35"> <textField> - <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="-1" width="1045" height="35"/> + <reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="-1" width="1095" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -78,56 +78,56 @@ <text><![CDATA[物品名称]]></text> </staticText> <staticText> - <reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="380" y="0" width="50" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="3ddf7178-e704-4c96-bc9f-106e3b6d50cc" style="table_TH" x="380" 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="510" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" 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="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="895" y="0" width="70" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" 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="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="965" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="5957a0a9-0a13-4bcd-9199-5c6ce6b6014e" style="table_TH" x="995" 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="430" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="08e8c4f2-7992-4b1b-bc4b-c98923482960" style="table_TH" x="450" 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="590" y="0" width="145" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="610" 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="815" 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> <text><![CDATA[失效期]]></text> </staticText> <staticText> - <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="735" y="0" width="80" height="34" backcolor="#FFFFFF"/> + <reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="755" y="0" width="80" height="34" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -152,14 +152,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="965" y="-1" width="80" height="35" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="995" y="-1" 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="-1" width="865" height="35"/> + <reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="-1" width="895" height="35"/> <subreportParameter name="depart"> <subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression> </subreportParameter> @@ -172,21 +172,21 @@ <pageFooter> <band height="71" splitType="Stretch"> <textField> - <reportElement uuid="6fbd774a-d10e-4db8-99f8-c7fdd600c61f" x="0" y="0" width="895" height="71"/> + <reportElement uuid="6fbd774a-d10e-4db8-99f8-c7fdd600c61f" x="0" y="0" width="915" height="71"/> <textElement verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="001cdc62-ce22-4f2a-a982-6afb6668c845" x="895" y="0" width="70" height="70"/> + <reportElement uuid="001cdc62-ce22-4f2a-a982-6afb6668c845" x="915" y="0" width="80" height="70"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA["第 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement uuid="e737b9b8-dca2-4238-8eb1-380f35945aea" x="965" y="0" width="80" height="70"/> + <reportElement uuid="e737b9b8-dca2-4238-8eb1-380f35945aea" x="995" y="0" width="100" height="70"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -204,18 +204,18 @@ <textFieldExpression><![CDATA["合计"]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="430" y="-1" width="535" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="e20b67d4-cb55-4c58-aaaf-9711aa3d8d79" style="table_TH" x="450" y="-1" 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="965" y="-1" width="80" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="995" y="-1" 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 pattern="###0"> - <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="380" y="-1" width="50" height="35" backcolor="#FFFFFF"/> + <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TH" x="380" y="-1" width="70" height="35" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper =================================================================== diff -u -r13450 -r13919 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml =================================================================== diff -u -r13448 -r13919 --- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml (.../DepartmentMonthDetail_child.jrxml) (revision 13448) +++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml (.../DepartmentMonthDetail_child.jrxml) (revision 13919) @@ -1,5 +1,5 @@ <?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="865" pageHeight="700" columnWidth="865" 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="895" pageHeight="700" columnWidth="895" 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"/> @@ -67,49 +67,49 @@ <textFieldExpression><![CDATA[$F{goodsName}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0bf156d3-7fc1-45bc-9252-2f3a44b09781" style="table_TD" stretchType="RelativeToBandHeight" x="280" y="0" width="50" height="35"/> + <reportElement uuid="0bf156d3-7fc1-45bc-9252-2f3a44b09781" style="table_TD" stretchType="RelativeToBandHeight" x="280" 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="410" y="0" width="80" height="35"/> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="430" 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="795" y="0" width="70" height="35"/> + <reportElement uuid="333fac08-3646-4228-886a-62068ff1e7de" 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{settlementPrice}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="330" y="0" width="80" height="35"/> + <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="350" 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="490" y="0" width="145" height="35"/> + <reportElement uuid="fe4771fa-fe7d-4c01-bb10-28fb7bb850d1" style="table_TD" x="510" 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="715" 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> <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="635" y="0" width="80" height="35"/> + <reportElement uuid="81606dbd-1f31-4aed-ba2d-507bda07689e" style="table_TD" stretchType="RelativeToBandHeight" x="655" y="0" width="80" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper =================================================================== diff -u -r13448 -r13919 Binary files differ