Index: ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml
===================================================================
diff -u -r12640 -r14753
--- ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml	(.../materialMissTotalView.jrxml)	(revision 12640)
+++ ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml	(.../materialMissTotalView.jrxml)	(revision 14753)
@@ -1,6 +1,6 @@
 <?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="materialMissTotalView" language="groovy" pageWidth="600" pageHeight="700" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="46c12114-c565-4e6e-b2e1-aa89446f4681">
-	<property name="ireport.zoom" value="1.0"/>
+<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="materialMissTotalView" language="groovy" pageWidth="600" pageHeight="660" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="46c12114-c565-4e6e-b2e1-aa89446f4681">
+	<property name="ireport.zoom" value="1.0000000000000004"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
@@ -32,7 +32,7 @@
 		<![CDATA[SELECT
      sum(r.amount) totalamount,
      r.materialname,
-     r.materialcost AS price
+     case when r.materialcost is null then 0.00 else r.materialcost end  price
 FROM
      recyclingerror r
 WHERE
@@ -60,9 +60,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d5290296-9bf3-494a-8c8b-799903e456b6" mode="Transparent" x="0" y="0" width="600" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d5290296-9bf3-494a-8c8b-799903e456b6" mode="Transparent" x="0" y="0" width="600" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="Serif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -72,30 +72,30 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="97c7b304-9bb2-4578-a28a-aad287c1ca72" style="table_TH" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="97c7b304-9bb2-4578-a28a-aad287c1ca72" style="table_TH" x="0" y="0" width="240" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="17456410-01bf-4864-96b1-605cad66dc6d" style="table_TH" x="240" y="0" width="120" height="30"/>
+				<reportElement uuid="17456410-01bf-4864-96b1-605cad66dc6d" style="table_TH" x="240" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[丢失总数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="69d87b29-e1d7-4858-b719-ee21a492767d" style="table_TH" x="360" y="0" width="120" height="30"/>
+				<reportElement uuid="69d87b29-e1d7-4858-b719-ee21a492767d" style="table_TH" x="360" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料价格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="31f7e125-4502-47b3-8034-c0ca32b0b781" style="table_TH" x="480" y="0" width="120" height="30"/>
+				<reportElement uuid="31f7e125-4502-47b3-8034-c0ca32b0b781" style="table_TH" x="480" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -104,9 +104,9 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="32529793-9d33-4bfa-bbf4-e89be42f3cf3" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="32529793-9d33-4bfa-bbf4-e89be42f3cf3" x="0" y="0" width="240" height="33"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -120,7 +120,7 @@
 				<textFieldExpression><![CDATA[$F{materialname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="240" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="240" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -134,8 +134,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalamount}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="360" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="360" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -147,10 +147,10 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{price}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{price} == null ? 0.00 : $F{price}]]></textFieldExpression>
 			</textField>
-			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="480" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="480" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -162,35 +162,35 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{totalamount}*$F{price}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{price} == null ? 0.00 : $F{totalamount}*$F{price}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
 	<summary>
-		<band height="30">
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="b6f69632-e34f-45b2-af41-1b3b4ed44ce2" style="table_CH" x="480" y="0" width="120" height="30"/>
+		<band height="33">
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="b6f69632-e34f-45b2-af41-1b3b4ed44ce2" style="table_CH" x="480" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalprice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="5461450b-c980-47b2-a406-63a6045a3753" style="table_CH" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="5461450b-c980-47b2-a406-63a6045a3753" style="table_CH" x="0" y="0" width="240" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[总计：]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="9ddf0f1c-7f14-4f1b-bd87-651bc0531a43" style="table_CH" x="240" y="0" width="120" height="30"/>
+				<reportElement uuid="9ddf0f1c-7f14-4f1b-bd87-651bc0531a43" style="table_CH" x="240" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sumAmount}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="64b7c321-b8ff-468a-a21c-5c5d88ca99f5" style="table_CH" x="360" y="0" width="120" height="30"/>
+				<reportElement uuid="64b7c321-b8ff-468a-a21c-5c5d88ca99f5" style="table_CH" x="360" y="0" width="120" height="33"/>
 				<textElement/>
 				<text><![CDATA[]]></text>
 			</staticText>