Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml =================================================================== diff -u -r12331 -r13143 --- ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 12331) +++ ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 13143) @@ -1,5 +1,5 @@ - + @@ -87,13 +87,16 @@ + + + <band height="34" splitType="Stretch"> <staticText> - <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="700" height="34"/> + <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="800" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> @@ -104,120 +107,120 @@ <columnHeader> <band height="33" splitType="Stretch"> <staticText> - <reportElement uuid="67bb57d3-2cba-45c1-a213-457b58914ce5" style="table_TH" mode="Opaque" x="55" y="0" width="184" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="67bb57d3-2cba-45c1-a213-457b58914ce5" style="table_TH" mode="Opaque" x="55" y="0" width="244" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[名称]]></text> </staticText> <staticText> - <reportElement uuid="5c291727-4353-49d4-9e6c-6886d7a7f8b3" style="table_TH" mode="Opaque" x="239" y="0" width="86" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="5c291727-4353-49d4-9e6c-6886d7a7f8b3" style="table_TH" mode="Opaque" x="418" y="0" width="86" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[上月总数]]></text> </staticText> <staticText> - <reportElement uuid="00983ad7-c920-42b2-abf3-2bb86533130c" style="table_TH" mode="Opaque" x="325" y="0" width="63" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="00983ad7-c920-42b2-abf3-2bb86533130c" style="table_TH" mode="Opaque" x="588" y="0" width="63" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[报废]]></text> </staticText> <staticText> - <reportElement uuid="bbc1e3b6-4306-4acf-8932-61cf9e8123dc" style="table_TH" mode="Opaque" x="388" y="0" width="67" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="bbc1e3b6-4306-4acf-8932-61cf9e8123dc" style="table_TH" mode="Opaque" x="651" y="0" width="67" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[入库]]></text> </staticText> <staticText> - <reportElement uuid="fd7d0ef2-6865-425c-971a-9d156340a10f" style="table_TH" mode="Opaque" x="455" y="0" width="82" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="fd7d0ef2-6865-425c-971a-9d156340a10f" style="table_TH" mode="Opaque" x="718" y="0" width="82" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[本月总数]]></text> </staticText> <staticText> - <reportElement uuid="3924a602-bedf-41d7-a3ab-5930b372862b" style="table_TH" mode="Opaque" x="537" y="0" width="79" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="7da7eae9-d41d-487a-afe9-9accb2233b3d" style="table_TH" mode="Opaque" x="0" y="0" width="55" height="33" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[本月库存]]></text> + <text><![CDATA[编号]]></text> </staticText> <staticText> - <reportElement uuid="608fab83-c2d8-4f3e-9e8d-b6391091133d" style="table_TD" mode="Opaque" x="616" y="0" width="84" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="4233c6c7-19a4-4cbb-9290-2d07fc130e93" style="table 1_TH" x="504" y="0" width="84" height="33" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[本月运作]]></text> + <text><![CDATA[丢失]]></text> </staticText> <staticText> - <reportElement uuid="7da7eae9-d41d-487a-afe9-9accb2233b3d" style="table_TH" mode="Opaque" x="0" y="0" width="55" height="33" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="6354e9bd-4e3d-49e2-bd88-e81bd88c4a63" style="table 1_TH" mode="Opaque" x="299" y="0" width="119" height="33" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[编号]]></text> + <text><![CDATA[规格]]></text> </staticText> </band> </columnHeader> <detail> <band height="25" splitType="Stretch"> <textField> - <reportElement uuid="4dc3cf68-de9f-4b0e-aaaa-b98914733d58" style="table_TD" x="55" y="0" width="184" height="25"/> + <reportElement uuid="4dc3cf68-de9f-4b0e-aaaa-b98914733d58" style="table_TD" x="55" y="0" width="244" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{name}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a3e37a99-3420-484a-aec8-78014870b8fe" style="table_TD" x="239" y="0" width="86" height="25"/> + <reportElement uuid="a3e37a99-3420-484a-aec8-78014870b8fe" style="table_TD" x="418" y="0" width="86" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{lastMonthSum}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="af45dcc2-7124-4bd1-88f4-8d7525b4cc34" style="table_TD" x="325" y="0" width="63" height="25"/> + <reportElement uuid="af45dcc2-7124-4bd1-88f4-8d7525b4cc34" style="table_TD" x="588" y="0" width="63" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{scrap}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="9d01bdae-db7f-457b-8717-849ac2fd4417" style="table_TD" x="388" y="0" width="67" height="25"/> + <reportElement uuid="9d01bdae-db7f-457b-8717-849ac2fd4417" style="table_TD" x="651" y="0" width="67" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{warehousing}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bc43cfe9-8eb2-4721-9cfa-51d680d96f55" style="table_TD" x="455" y="0" width="82" height="25"/> + <reportElement uuid="bc43cfe9-8eb2-4721-9cfa-51d680d96f55" style="table_TD" x="718" y="0" width="82" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{currentMonthSum}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="78d71375-57f5-46ea-b556-1989cb5c1d4d" style="table_TD" x="537" y="0" width="79" height="25"/> + <reportElement uuid="8f3e2c40-d02f-4dd4-8cd6-4586475b0ac0" style="table_TD" x="0" y="0" width="55" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{currentStock}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{sNumber}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="dee8cb23-5fc9-41e5-be94-58e5fa6e9c20" style="table_TD" x="616" y="0" width="84" height="25"/> + <reportElement uuid="3f3ec07d-4001-404e-bc8a-b150bea84fcd" style="table_TD" x="504" y="0" width="84" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{currentMonthOperation}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{lost}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="8f3e2c40-d02f-4dd4-8cd6-4586475b0ac0" style="table_TD" x="0" y="0" width="55" height="25"/> + <textField isBlankWhenNull="true"> + <reportElement uuid="10469d7f-b0f7-4cd8-bd1d-cdfeeaf10fb7" style="table_TD" x="299" y="0" width="119" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$F{sNumber}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{specification}]]></textFieldExpression> </textField> </band> </detail>