Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml =================================================================== diff -u -r18235 -r31575 --- ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 18235) +++ ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml (.../supplyRoomApplianceMonthStatistics.jrxml) (revision 31575) @@ -1,5 +1,5 @@ - + @@ -96,7 +96,7 @@ <band height="34" splitType="Stretch"> <staticText> - <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="800" height="34"/> + <reportElement uuid="5d88e429-354d-4d63-886e-cad6abb66010" x="0" y="0" width="963" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> @@ -142,26 +142,40 @@ <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> <staticText> - <reportElement uuid="4233c6c7-19a4-4cbb-9290-2d07fc130e93" style="table 1_TH" x="504" y="0" width="84" height="33" backcolor="#D9EEDE"/> + <reportElement uuid="3924a602-bedf-41d7-a3ab-5930b372862b" style="table_TH" mode="Opaque" x="800" y="0" width="79" 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="6354e9bd-4e3d-49e2-bd88-e81bd88c4a63" style="table 1_TH" mode="Opaque" x="299" y="0" width="119" height="33" backcolor="#D9EEDE"/> + <reportElement uuid="608fab83-c2d8-4f3e-9e8d-b6391091133d" style="table_TD" mode="Opaque" x="879" y="0" width="84" 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="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> + </staticText> + <staticText> + <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> + </staticText> </band> </columnHeader> <detail> @@ -202,6 +216,20 @@ <textFieldExpression><![CDATA[$F{currentMonthSum}]]></textFieldExpression> </textField> <textField> + <reportElement uuid="78d71375-57f5-46ea-b556-1989cb5c1d4d" style="table_TD" x="800" y="0" width="79" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{currentStock}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="dee8cb23-5fc9-41e5-be94-58e5fa6e9c20" style="table_TD" x="879" y="0" width="84" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$F{currentMonthOperation}]]></textFieldExpression> + </textField> + <textField> <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"/> Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jasper =================================================================== diff -u -r13143 -r31575 Binary files differ