Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml
===================================================================
diff -u -r15297 -r15531
--- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml	(.../invoiceItemsQuery_child_1.jrxml)	(revision 15297)
+++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml	(.../invoiceItemsQuery_child_1.jrxml)	(revision 15531)
@@ -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="monthDetail_child_1" language="groovy" pageWidth="1445" pageHeight="842" columnWidth="1445" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="bd889010-8709-4014-9272-b71cb51c1fd3">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="261"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -82,49 +82,49 @@
 	<detail>
 		<band height="35" splitType="Stretch">
 			<textField>
-				<reportElement uuid="7b464986-5968-47c8-b91d-7392e3cd3487" style="table_TD" x="0" y="0" width="80" height="35"/>
+				<reportElement uuid="7b464986-5968-47c8-b91d-7392e3cd3487" style="table_TD" x="115" y="0" width="80" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="14e1d26b-1d27-49c8-92b4-b27135f799c2" style="table_TD" x="80" y="0" width="150" height="35"/>
+				<reportElement uuid="14e1d26b-1d27-49c8-92b4-b27135f799c2" style="table_TD" x="195" y="0" width="150" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{goodsName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="972c6d5d-9f49-4c3c-9b4b-d24ee98323d5" style="table_TD" x="455" y="0" width="115" height="35"/>
+				<reportElement uuid="972c6d5d-9f49-4c3c-9b4b-d24ee98323d5" style="table_TD" x="0" y="0" width="115" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{time}.substring(0, 16)]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="570" y="0" width="70" height="35"/>
+				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="850" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{applicant}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b950364c-8d9e-4aa6-9617-22dd9ef34559" style="table_TD" x="300" y="0" width="70" height="35"/>
+				<reportElement uuid="b950364c-8d9e-4aa6-9617-22dd9ef34559" style="table_TD" x="345" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="526a01c7-1616-4ba1-be9c-75176b1d86a2" style="table_TD" x="780" y="0" width="85" height="35"/>
+				<reportElement uuid="526a01c7-1616-4ba1-be9c-75176b1d86a2" style="table_TD" x="415" y="0" width="85" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{batch}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="d74e31c5-06b2-4162-8248-5b81b9f50f33" style="table_TD" x="230" y="0" width="70" height="35"/>
+				<reportElement uuid="d74e31c5-06b2-4162-8248-5b81b9f50f33" style="table_TD" x="1060" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -138,21 +138,21 @@
 				<textFieldExpression><![CDATA[$F{remark}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="8a467495-6213-4633-bf1d-78c3912db193" style="table_TD" x="865" y="0" width="100" height="35"/>
+				<reportElement uuid="8a467495-6213-4633-bf1d-78c3912db193" style="table_TD" x="500" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterileEndTime}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e7e66f92-936e-4139-9238-1b8cade880eb" style="table_TD" x="1065" y="0" width="100" height="35"/>
+				<reportElement uuid="e7e66f92-936e-4139-9238-1b8cade880eb" style="table_TD" x="700" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizerName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="68c8407d-ad8b-4e05-8646-72d6dac23c8a" style="table_TD" x="1165" y="0" width="50" height="35"/>
+				<reportElement uuid="68c8407d-ad8b-4e05-8646-72d6dac23c8a" style="table_TD" x="800" y="0" width="50" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -166,28 +166,28 @@
 				<textFieldExpression><![CDATA[$F{hospitalNumber}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000">
-				<reportElement uuid="daab0914-2f4f-493f-8b7c-9e0aaa65e61a" style="table_TD" mode="Opaque" x="370" y="0" width="85" height="35"/>
+				<reportElement uuid="daab0914-2f4f-493f-8b7c-9e0aaa65e61a" style="table_TD" mode="Opaque" x="1130" y="0" width="85" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="640" y="0" width="70" height="35"/>
+				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="920" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sender}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="710" y="0" width="70" height="35"/>
+				<reportElement uuid="88e1da77-4a03-419a-9a82-246ebede48a2" style="table_TD" x="990" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{assistantSender}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="8a467495-6213-4633-bf1d-78c3912db193" style="table_TD" x="965" y="0" width="100" height="35"/>
+				<reportElement uuid="8a467495-6213-4633-bf1d-78c3912db193" style="table_TD" x="600" y="0" width="100" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
===================================================================
diff -u -r15297 -r15531
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
===================================================================
diff -u -r15297 -r15531
--- ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml	(.../invoiceItemsQuery_main_1.jrxml)	(revision 15297)
+++ ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml	(.../invoiceItemsQuery_main_1.jrxml)	(revision 15531)
@@ -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="monthDetail_main_1" language="groovy" pageWidth="1545" pageHeight="792" whenNoDataType="AllSectionsNoDetail" columnWidth="1545" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="443"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -45,42 +45,35 @@
 	<columnHeader>
 		<band height="72" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="4af9d9c4-05f6-4cc1-9695-aabf5fe9b589" style="table_TH" x="100" y="41" width="80" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="4af9d9c4-05f6-4cc1-9695-aabf5fe9b589" style="table_TH" x="215" y="41" width="80" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[条码]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="180" y="41" width="150" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="295" y="41" width="150" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="400" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="445" y="41" width="70" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="670" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="100" y="41" width="115" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
-				<text><![CDATA[申请人]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="555" y="41" width="115" height="31" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
-				</textElement>
 				<text><![CDATA[发货时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="880" y="41" width="85" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="515" y="41" width="85" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -94,7 +87,7 @@
 				<text><![CDATA[科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ce90b97b-e553-4841-bccb-f3abc32699df" style="table_TH" x="330" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="ce90b97b-e553-4841-bccb-f3abc32699df" style="table_TH" x="1160" y="41" width="70" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -108,21 +101,14 @@
 				<text><![CDATA[发货物品查询]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="022d2f24-4760-4a35-ad5e-012fa4136401" style="table_TH" x="1265" y="41" width="50" height="31" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[炉次]]></text>
-			</staticText>
-			<staticText>
 				<reportElement uuid="f94edfc9-76e8-438a-895d-e14dde91a97f" style="table_TH" mode="Opaque" x="1465" y="41" width="80" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[住院号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="3991ac92-a5ce-43ec-bb01-ed7e9b5e562f" style="table_TH" mode="Opaque" x="470" y="41" width="85" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="3991ac92-a5ce-43ec-bb01-ed7e9b5e562f" style="table_TH" mode="Opaque" x="1230" y="41" width="85" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -136,35 +122,49 @@
 				<text><![CDATA[备注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="61b18742-3044-4507-a30f-39a2b39d81e3" style="table_TH" x="1065" y="41" width="100" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="61b18742-3044-4507-a30f-39a2b39d81e3" style="table_TH" x="700" y="41" width="100" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[失效日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ee55bb74-bbfa-4375-9e15-0b43654ee0d0" style="table_TH" x="1165" y="41" width="100" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="61b18742-3044-4507-a30f-39a2b39d81e3" style="table_TH" x="600" y="41" width="100" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[灭菌炉]]></text>
+				<text><![CDATA[灭菌日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="61b18742-3044-4507-a30f-39a2b39d81e3" style="table_TH" x="965" y="41" width="100" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="950" y="41" width="70" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[申请人]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="022d2f24-4760-4a35-ad5e-012fa4136401" style="table_TH" x="900" y="41" width="50" height="31" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[灭菌日期]]></text>
+				<text><![CDATA[炉次]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="740" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="ee55bb74-bbfa-4375-9e15-0b43654ee0d0" style="table_TH" x="800" y="41" width="100" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[灭菌炉]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1020" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[发货员]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="810" y="41" width="70" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1090" y="41" width="70" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
===================================================================
diff -u -r15297 -r15531
Binary files differ