Index: ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml
===================================================================
diff -u -r31491 -r39070
--- ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml	(.../godownEntryDetailStatistic.jrxml)	(revision 31491)
+++ ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml	(.../godownEntryDetailStatistic.jrxml)	(revision 39070)
@@ -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="godownEntryDetailStatistic" language="groovy" pageWidth="1440" pageHeight="1032" whenNoDataType="BlankPage" columnWidth="1440" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7abd0686-a7d6-4012-abc6-caa220056f14">
+<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="godownEntryDetailStatistic" language="groovy" pageWidth="1560" pageHeight="1032" whenNoDataType="BlankPage" columnWidth="1560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7abd0686-a7d6-4012-abc6-caa220056f14">
 	<property name="ireport.zoom" value="0.9090909090909096"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="58"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -98,21 +98,21 @@
 	<title>
 		<band height="76" splitType="Stretch">
 			<textField>
-				<reportElement uuid="f11ebf50-b4c4-4a75-968d-3e87f17d0e15" x="0" y="0" width="1440" height="35"/>
+				<reportElement uuid="f11ebf50-b4c4-4a75-968d-3e87f17d0e15" x="0" y="0" width="1560" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e63df478-caca-444e-946e-0f568974b567" x="0" y="55" width="1440" height="21"/>
+				<reportElement uuid="e63df478-caca-444e-946e-0f568974b567" x="0" y="55" width="1560" height="21"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["统计时间: " + $F{timeStart}.substring( 0, 10 ) + " 到 " + $F{timeEnd}.substring( 0, 10 )+ "                                                                                                                                                                                                                                                                                                                          "+ "单位: " + $F{unit}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="ca288d7a-43ff-4bd2-a465-2fca7df2f57d" x="0" y="35" width="1440" height="20"/>
+				<reportElement uuid="ca288d7a-43ff-4bd2-a465-2fca7df2f57d" x="0" y="35" width="1560" height="20"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
@@ -123,7 +123,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="0d9c028d-a174-487a-ae51-2484debd93d3" style="table_CH" x="1220" y="0" width="80" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="0d9c028d-a174-487a-ae51-2484debd93d3" style="table_CH" x="1340" y="0" width="80" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -151,28 +151,28 @@
 				<text><![CDATA[生产厂家]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d10ebf3d-8d09-4c01-9c45-3bcf1fad257f" style="table_CH" x="1030" y="0" width="70" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="d10ebf3d-8d09-4c01-9c45-3bcf1fad257f" style="table_CH" x="1030" y="0" width="190" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[注册证号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d10ebf3d-8d09-4c01-9c45-3bcf1fad257f" style="table_CH" x="1160" y="0" width="60" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="d10ebf3d-8d09-4c01-9c45-3bcf1fad257f" style="table_CH" x="1280" y="0" width="60" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[单价]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ad21b91c-ce07-4fea-a3dd-849969b03889" style="table_CH" x="1100" y="0" width="60" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="ad21b91c-ce07-4fea-a3dd-849969b03889" style="table_CH" x="1220" y="0" width="60" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ad21b91c-ce07-4fea-a3dd-849969b03889" style="table_CH" x="1300" y="0" width="60" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="ad21b91c-ce07-4fea-a3dd-849969b03889" style="table_CH" x="1420" y="0" width="60" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -186,7 +186,7 @@
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9dd5f1ce-317f-4dff-bfaf-467861876d74" style="table_CH" x="1360" y="0" width="80" height="20" backcolor="#FFFFFF"/>
+				<reportElement uuid="9dd5f1ce-317f-4dff-bfaf-467861876d74" style="table_CH" x="1480" y="0" width="80" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -226,15 +226,15 @@
 		<band height="38" splitType="Stretch">
 			<elementGroup/>
 			<textField pattern="###0">
-				<reportElement uuid="1b4dce1d-c6fa-441a-bc1e-0953bc99fcc8" style="table_TD" stretchType="RelativeToBandHeight" x="1300" y="0" width="60" height="38" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1b4dce1d-c6fa-441a-bc1e-0953bc99fcc8" style="table_TD" stretchType="RelativeToBandHeight" x="1420" y="0" width="60" height="38" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{mainTotalAmount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="">
-				<reportElement uuid="1b4dce1d-c6fa-441a-bc1e-0953bc99fcc8" style="table_TD" stretchType="RelativeToBandHeight" x="1360" y="0" width="80" height="38" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1b4dce1d-c6fa-441a-bc1e-0953bc99fcc8" style="table_TD" stretchType="RelativeToBandHeight" x="1480" y="0" width="80" height="38" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -251,7 +251,7 @@
 				</textField>
 			</elementGroup>
 			<subreport>
-				<reportElement uuid="d291c5fd-ad62-422d-97d1-73e85f7bf0fa" x="211" y="0" width="1089" height="38" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="d291c5fd-ad62-422d-97d1-73e85f7bf0fa" x="211" y="0" width="1209" height="38" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="diposableId"/>
 				<subreportParameter name="timeEnd"/>
 				<subreportParameter name="timeStart"/>
@@ -267,14 +267,14 @@
 	<pageFooter>
 		<band height="62">
 			<textField>
-				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="0" y="0" width="1360" height="62"/>
+				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="0" y="0" width="1480" height="62"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["第" + $V{PAGE_NUMBER} + "页"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="002faf66-81aa-4b34-8f23-3725255684fe" x="1360" y="0" width="80" height="62"/>
+				<reportElement uuid="002faf66-81aa-4b34-8f23-3725255684fe" x="1480" y="0" width="80" height="62"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -292,14 +292,14 @@
 				<textFieldExpression><![CDATA["制表人: " + $F{author}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="002faf66-81aa-4b34-8f23-3725255684fe" x="1360" y="0" width="80" height="20"/>
+				<reportElement uuid="002faf66-81aa-4b34-8f23-3725255684fe" x="1480" y="0" width="80" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["共" + $V{PAGE_NUMBER} + "页"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="211" y="0" width="1149" height="20"/>
+				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="211" y="0" width="1269" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -317,15 +317,15 @@
 				<text><![CDATA[合计（元）]]></text>
 			</staticText>
 			<textField pattern="">
-				<reportElement uuid="7b05b591-1869-4855-b9e1-57da009842a0" style="table_TD" x="1360" y="0" width="80" height="21"/>
+				<reportElement uuid="7b05b591-1869-4855-b9e1-57da009842a0" style="table_TD" x="1480" y="0" width="80" height="21"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalPrice}]]></textFieldExpression>
 				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="d12657e6-f296-408c-8056-b4ebd0cff9f2" style="table_TD" x="211" y="0" width="1149" height="21"/>
+				<reportElement uuid="d12657e6-f296-408c-8056-b4ebd0cff9f2" style="table_TD" x="211" y="0" width="1269" height="21"/>
 				<textElement/>
 				<text><![CDATA[]]></text>
 			</staticText>