Index: ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
===================================================================
diff -u -r14530 -r15296
--- ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 14530)
+++ ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml	(.../DepartmentMonthDetail.jrxml)	(revision 15296)
@@ -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" language="groovy" pageWidth="1176" pageHeight="875" columnWidth="1176" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="701ff2f7-7ef5-4278-be9c-7a914bd1521b">
+<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="1096" pageHeight="875" columnWidth="1096" 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"/>
@@ -53,7 +53,7 @@
 	<title>
 		<band height="35">
 			<textField>
-				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1175" height="35"/>
+				<reportElement uuid="44490171-536f-433c-ba9c-7d6e64a00900" x="0" y="0" width="1095" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -92,14 +92,14 @@
 				<text><![CDATA[单价（元）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="27328556-20ed-4384-959d-d0be3328fdec" style="table_TH" x="995" y="0" width="80" 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="1075" y="0" width="100" 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>
@@ -120,20 +120,13 @@
 				<text><![CDATA[生产厂家]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="207fe40d-3a67-4738-ac6d-59b1a52f3096" style="table_TH" x="915" 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="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="81cca96c-e1ce-4713-86de-05fc14c4899d" style="table_TH" x="100" y="0" width="80" height="34" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
@@ -159,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="1075" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="995" 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="975" height="35"/>
+				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="895" height="35"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -214,13 +207,6 @@
 				<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="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/>
@@ -232,6 +218,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression>
 			</textField>
+			<textField pattern="###0.0000;-###0.0000" isBlankWhenNull="true">
+				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="994" y="0" width="101" height="35" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum_totalPrice}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>