Index: ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport.jrxml
===================================================================
diff -u -r35515 -r35621
--- ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport.jrxml	(.../instrumentRepairReport.jrxml)	(revision 35515)
+++ ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport.jrxml	(.../instrumentRepairReport.jrxml)	(revision 35621)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="instrumentRepairReport" language="groovy" pageWidth="1400" pageHeight="300" columnWidth="1400" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
-	<property name="ireport.zoom" value="0.9090909090909091"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="419"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -64,7 +63,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="0" width="1400" height="30" uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b"/>
+				<reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1400" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -75,70 +74,70 @@
 	<columnHeader>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" backcolor="#FFFFFF" uuid="d2c35607-bde5-4c14-92b1-e100f9a278cb"/>
+				<reportElement uuid="d2c35607-bde5-4c14-92b1-e100f9a278cb" style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[登记人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="1200" y="0" width="200" height="30" backcolor="#FFFFFF" uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_TH" stretchType="RelativeToBandHeight" x="1200" y="0" width="200" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[备注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="1000" y="0" width="200" height="30" backcolor="#FFFFFF" uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_TH" stretchType="RelativeToBandHeight" x="1000" y="0" width="200" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[故障原因/故障点]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToTallestObject" x="200" y="0" width="80" height="30" backcolor="#FFFFFF" uuid="7fe469a8-eb2d-4719-9d43-5d706e05ef58"/>
+				<reportElement uuid="7fe469a8-eb2d-4719-9d43-5d706e05ef58" style="table_TH" stretchType="RelativeToTallestObject" x="200" y="0" width="80" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[维修状态]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="880" y="0" width="120" height="30" backcolor="#FFFFFF" uuid="cfca2b34-ddee-440a-ab00-8f2561900444"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_TH" stretchType="RelativeToBandHeight" x="880" y="0" width="120" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[回科时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="80" y="0" width="120" height="30" backcolor="#FFFFFF" uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e"/>
+				<reportElement uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e" style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="80" y="0" width="120" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[登记时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="760" y="0" width="120" height="30" backcolor="#FFFFFF" uuid="cfca2b34-ddee-440a-ab00-8f2561900444"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_TH" stretchType="RelativeToBandHeight" x="760" y="0" width="120" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[出科时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="280" y="0" width="200" height="30" backcolor="#FFFFFF" uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_TH" stretchType="RelativeToBandHeight" x="280" y="0" width="200" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="680" y="0" width="80" height="30" backcolor="#FFFFFF" uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_TH" stretchType="RelativeToBandHeight" x="680" y="0" width="80" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="table_TH" stretchType="RelativeToBandHeight" x="480" y="0" width="200" height="30" backcolor="#FFFFFF" uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_TH" stretchType="RelativeToBandHeight" x="480" y="0" width="200" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -148,8 +147,8 @@
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" uuid="1c0be745-af8b-44b7-9e0d-4789ab5184df"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="1c0be745-af8b-44b7-9e0d-4789ab5184df" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -162,49 +161,49 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{registrantName}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="1200" y="0" width="200" height="30" uuid="eef7d363-7929-4919-9657-f3e6f0723302"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1200" y="0" width="200" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12" isStrikeThrough="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{remark}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="1000" y="0" width="200" height="30" uuid="eef7d363-7929-4919-9657-f3e6f0723302"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1000" y="0" width="200" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{repairDesc}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="880" y="0" width="120" height="30" uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="880" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{returnHandoverDateTimeStr}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="80" y="0" width="120" height="30" uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99" style="table_TD" stretchType="RelativeToBandHeight" x="80" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{registerDateTimeStr}]]></textFieldExpression>
 			</textField>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="760" y="0" width="120" height="30" uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="760" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{outHandoverDateTimeStr}]]></textFieldExpression>
 			</textField>
 			<subreport isUsingCache="true" runToBottom="false">
-				<reportElement stretchType="RelativeToBandHeight" mode="Transparent" x="280" y="0" width="480" height="30" uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32"/>
+				<reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" mode="Transparent" x="280" y="0" width="480" height="30"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{instrumentRepairGoodsVos})]]></dataSourceExpression>
 				<returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "instrumentRepairReport_subreport1.jasper"]]></subreportExpression>
 			</subreport>
-			<textField textAdjust="ScaleFont" isBlankWhenNull="true">
-				<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="200" y="0" width="80" height="30" uuid="a1bd59c5-f4a8-4ad5-ab32-7f29ffee4948"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="a1bd59c5-f4a8-4ad5-ab32-7f29ffee4948" style="table_TD" stretchType="RelativeToBandHeight" x="200" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>