Index: ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml =================================================================== diff -u -r13210 -r13212 --- ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml (.../stocktakereport.jrxml) (revision 13210) +++ ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml (.../stocktakereport.jrxml) (revision 13212) @@ -1,5 +1,5 @@ - + @@ -103,7 +103,7 @@ <band height="39" splitType="Stretch"> <textField> - <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="1015" height="39"/> + <reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="1154" height="39"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> @@ -149,28 +149,28 @@ <text><![CDATA[单位]]></text> </staticText> <staticText> - <reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="514" y="0" width="150" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="514" y="0" width="160" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[期初库存]]></text> </staticText> <staticText> - <reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="664" y="0" width="150" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="674" y="0" width="160" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[本期入库]]></text> </staticText> <staticText> - <reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="814" y="0" width="150" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="834" y="0" width="160" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[本期出库]]></text> </staticText> <staticText> - <reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="964" y="0" width="150" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="994" y="0" width="160" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -184,49 +184,49 @@ <text><![CDATA[数量]]></text> </staticText> <staticText> - <reportElement uuid="78bc4a86-3d5c-4d7c-b57e-5f30a14a2ddc" style="table_CH" x="589" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="78bc4a86-3d5c-4d7c-b57e-5f30a14a2ddc" style="table_CH" x="589" y="20" width="85" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[金额]]></text> </staticText> <staticText> - <reportElement uuid="c7920710-66c2-4247-86eb-48781f277220" style="table_CH" x="664" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="c7920710-66c2-4247-86eb-48781f277220" style="table_CH" x="674" y="20" width="75" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[数量]]></text> </staticText> <staticText> - <reportElement uuid="09aeea6a-6a40-461f-9332-fb24b9fefaac" style="table_CH" x="739" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="09aeea6a-6a40-461f-9332-fb24b9fefaac" style="table_CH" x="749" y="20" width="85" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[金额]]></text> </staticText> <staticText> - <reportElement uuid="50ae18ea-d997-4b1b-b248-e509921e0029" style="table_CH" x="814" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="50ae18ea-d997-4b1b-b248-e509921e0029" style="table_CH" x="834" y="20" width="75" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[数量]]></text> </staticText> <staticText> - <reportElement uuid="a53a3102-dc49-4b56-a79f-5a521519576f" style="table_CH" x="889" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="a53a3102-dc49-4b56-a79f-5a521519576f" style="table_CH" x="909" y="20" width="85" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[金额]]></text> </staticText> <staticText> - <reportElement uuid="6d710490-c0a3-493a-b847-dcaf8fc095a3" style="table_CH" x="964" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="6d710490-c0a3-493a-b847-dcaf8fc095a3" style="table_CH" x="994" y="20" width="75" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[数量]]></text> </staticText> <staticText> - <reportElement uuid="0a932323-f4ea-4e68-9bb2-d62f96fc5498" style="table_CH" x="1039" y="20" width="75" height="20" backcolor="#FFFFFF"/> + <reportElement uuid="0a932323-f4ea-4e68-9bb2-d62f96fc5498" style="table_CH" x="1069" y="20" width="85" height="20" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -278,50 +278,50 @@ </textElement> <textFieldExpression><![CDATA[$F{startStockAmount}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="589" y="0" width="75" height="25"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="589" y="0" width="85" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{startStockPrice}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="7a90c810-a863-4e9a-a34d-8b98d4dab916" style="table_TD" x="664" y="0" width="75" height="25"/> + <reportElement uuid="7a90c810-a863-4e9a-a34d-8b98d4dab916" style="table_TD" x="674" y="0" width="75" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{inStorageAmount}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="739" y="0" width="75" height="25"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="749" y="0" width="85" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{inStoragePrice}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a8229967-3b92-4664-8ece-f6a07b705acd" style="table_TD" x="814" y="0" width="75" height="25"/> + <reportElement uuid="a8229967-3b92-4664-8ece-f6a07b705acd" style="table_TD" x="834" y="0" width="75" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{outStorageAmount}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="889" y="0" width="75" height="25"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="909" y="0" width="85" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{outStoragePrice}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="21d3c500-00e0-47d0-8b54-d4cdf953feff" style="table_TD" x="964" y="0" width="75" height="25"/> + <reportElement uuid="21d3c500-00e0-47d0-8b54-d4cdf953feff" style="table_TD" x="994" y="0" width="75" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{endStockAmount}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="1039" y="0" width="75" height="25"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="1069" y="0" width="85" height="25"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -338,50 +338,50 @@ </textElement> <textFieldExpression><![CDATA[$V{tAmount1}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="8c9274a4-5688-450e-bfc9-e767f043f3ca" style="table_CH" x="589" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="8c9274a4-5688-450e-bfc9-e767f043f3ca" style="table_CH" x="589" y="0" width="85" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tPrice1}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="4bdb4873-b36a-4ccd-93c5-325a370a2876" style="table_CH" x="664" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <reportElement uuid="4bdb4873-b36a-4ccd-93c5-325a370a2876" style="table_CH" x="674" y="0" width="75" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tAmount2}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="42ffe661-0300-4bde-8faf-0b54f0d4e562" style="table_CH" x="739" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="42ffe661-0300-4bde-8faf-0b54f0d4e562" style="table_CH" x="749" y="0" width="85" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tPrice2}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="3482860a-6617-4d48-aeb6-463517847711" style="table_CH" x="814" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <reportElement uuid="3482860a-6617-4d48-aeb6-463517847711" style="table_CH" x="834" y="0" width="75" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tAmount3}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="d163fb0a-e81a-4e05-80f4-6a0259af3515" style="table_CH" x="889" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="d163fb0a-e81a-4e05-80f4-6a0259af3515" style="table_CH" x="909" y="0" width="85" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tPrcie3}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a56c82a9-1351-4fd3-ae87-15a083679995" style="table_CH" x="964" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <reportElement uuid="a56c82a9-1351-4fd3-ae87-15a083679995" style="table_CH" x="994" y="0" width="75" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$V{tAmount4}]]></textFieldExpression> </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="bc6f9367-ca6c-43f0-887c-1a888521ce74" style="table_CH" x="1039" y="0" width="75" height="25" backcolor="#FFFFFF"/> + <textField pattern="###0.0000;-###0.0000"> + <reportElement uuid="bc6f9367-ca6c-43f0-887c-1a888521ce74" style="table_CH" x="1069" y="0" width="85" height="25" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement>