IS_Trebic
/
isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Další oprava sestavy objednávky.

Browse Source 
refs #136
multitenant
Josef Rokos 10 years ago
parent 35537f7e8b
commit 81ff039da8
4 changed files with 96 additions and 220 deletions
Show Stats Download Patch File Download Diff File

BIN
src/main/webapp/WEB-INF/reports/order.jasper
View File

Binary file not shown.

250
src/main/webapp/WEB-INF/reports/order.jrxml
Unescape Escape View File

@ -2,201 +2,94 @@
<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="order" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="001cec2c-ccd4-45df-b6f6-2d28cf67ed6a">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="32"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[]]>
</queryString>
<field name="address" class="info.bukova.isspst.data.AddressEmb">
<fieldDescription><![CDATA[address]]></fieldDescription>
</field>
<field name="deliveryAddress" class="info.bukova.isspst.data.AddressEmb">
<fieldDescription><![CDATA[deliveryAddress]]></fieldDescription>
</field>
<field name="suplier" class="info.bukova.isspst.data.AddressEmb">
<fieldDescription><![CDATA[suplier]]></fieldDescription>
</field>
<field name="total" class="java.math.BigDecimal">
<fieldDescription><![CDATA[total]]></fieldDescription>
</field>
<field name="orderDate" class="java.util.Date">
<fieldDescription><![CDATA[orderDate]]></fieldDescription>
</field>
<field name="numser" class="java.lang.String">
<fieldDescription><![CDATA[numser]]></fieldDescription>
</field>
<field name="description" class="java.lang.String">
<fieldDescription><![CDATA[description]]></fieldDescription>
</field>
<field name="deliveryType" class="java.lang.String">
<fieldDescription><![CDATA[deliveryType]]></fieldDescription>
</field>
<field name="deliveryDate" class="java.util.Date">
<fieldDescription><![CDATA[deliveryDate]]></fieldDescription>
</field>
<field name="address.city" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.company" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.contactName" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.department" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.description" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.dic" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.email" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.houseNumber" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.ic" class="java.lang.Long">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.phone" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.state" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.street" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.web" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="address.zipCode" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.city" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.company" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.contactName" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.department" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.description" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.dic" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.email" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.houseNumber" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.ic" class="java.lang.Long">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.id" class="java.lang.Integer">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.phone" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.state" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.street" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.web" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="deliveryAddress.zipCode" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.city" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.company" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.contactName" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.department" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.description" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.dic" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.email" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.houseNumber" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.ic" class="java.lang.Long">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.id" class="java.lang.Integer">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.phone" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.state" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.street" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.web" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="suplier.zipCode" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="items" class="java.util.List">
<fieldDescription><![CDATA[items]]></fieldDescription>
</field>
<field name="address" class="info.bukova.isspst.data.AddressEmb"/>
<field name="deliveryAddress" class="info.bukova.isspst.data.AddressEmb"/>
<field name="suplier" class="info.bukova.isspst.data.AddressEmb"/>
<field name="total" class="java.math.BigDecimal"/>
<field name="orderDate" class="java.util.Date"/>
<field name="numser" class="java.lang.String"/>
<field name="description" class="java.lang.String"/>
<field name="deliveryType" class="java.lang.String"/>
<field name="deliveryDate" class="java.util.Date"/>
<field name="address.city" class="java.lang.String"/>
<field name="address.company" class="java.lang.String"/>
<field name="address.contactName" class="java.lang.String"/>
<field name="address.department" class="java.lang.String"/>
<field name="address.description" class="java.lang.String"/>
<field name="address.dic" class="java.lang.String"/>
<field name="address.email" class="java.lang.String"/>
<field name="address.houseNumber" class="java.lang.String"/>
<field name="address.ic" class="java.lang.Long"/>
<field name="address.phone" class="java.lang.String"/>
<field name="address.state" class="java.lang.String"/>
<field name="address.street" class="java.lang.String"/>
<field name="address.web" class="java.lang.String"/>
<field name="address.zipCode" class="java.lang.String"/>
<field name="deliveryAddress.city" class="java.lang.String"/>
<field name="deliveryAddress.company" class="java.lang.String"/>
<field name="deliveryAddress.contactName" class="java.lang.String"/>
<field name="deliveryAddress.department" class="java.lang.String"/>
<field name="deliveryAddress.description" class="java.lang.String"/>
<field name="deliveryAddress.dic" class="java.lang.String"/>
<field name="deliveryAddress.email" class="java.lang.String"/>
<field name="deliveryAddress.houseNumber" class="java.lang.String"/>
<field name="deliveryAddress.ic" class="java.lang.Long"/>
<field name="deliveryAddress.id" class="java.lang.Integer"/>
<field name="deliveryAddress.phone" class="java.lang.String"/>
<field name="deliveryAddress.state" class="java.lang.String"/>
<field name="deliveryAddress.street" class="java.lang.String"/>
<field name="deliveryAddress.web" class="java.lang.String"/>
<field name="deliveryAddress.zipCode" class="java.lang.String"/>
<field name="suplier.city" class="java.lang.String"/>
<field name="suplier.company" class="java.lang.String"/>
<field name="suplier.contactName" class="java.lang.String"/>
<field name="suplier.department" class="java.lang.String"/>
<field name="suplier.description" class="java.lang.String"/>
<field name="suplier.dic" class="java.lang.String"/>
<field name="suplier.email" class="java.lang.String"/>
<field name="suplier.houseNumber" class="java.lang.String"/>
<field name="suplier.ic" class="java.lang.Long"/>
<field name="suplier.id" class="java.lang.Integer"/>
<field name="suplier.phone" class="java.lang.String"/>
<field name="suplier.state" class="java.lang.String"/>
<field name="suplier.street" class="java.lang.String"/>
<field name="suplier.web" class="java.lang.String"/>
<field name="suplier.zipCode" class="java.lang.String"/>
<field name="items" class="java.util.List"/>
<field name="ownedBy" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
<pageHeader>
<band height="217" splitType="Stretch">
<band height="216" splitType="Stretch">
<staticText>
<reportElement uuid="e33386cf-55fb-4e87-9bc4-1305da3e3b4f" x="0" y="0" width="60" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[Dodavatel]]></text>
</staticText>
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="5fdef08a-c765-49f2-b586-62cfc465d066" x="10" y="30" width="264" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{suplier.company}]]></textFieldExpression>
</textField>
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="d0e9d0d0-3e48-4a55-9939-4a319a4e7fc7" x="10" y="50" width="264" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{suplier.street} + " " + $F{suplier.houseNumber}]]></textFieldExpression>
<textFieldExpression><![CDATA[($F{suplier.street} != null ? $F{suplier.street} : "") + " " + ($F{suplier.houseNumber} != null ? $F{suplier.houseNumber} : "")]]></textFieldExpression>
</textField>
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="6299a1b9-3f35-4338-a0a2-67833d3783e7" x="10" y="70" width="68" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{suplier.zipCode}]]></textFieldExpression>
</textField>
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="768dc3f2-630d-449c-b24e-075e55ce6e26" x="78" y="70" width="196" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{suplier.city}]]></textFieldExpression>
@ -337,12 +230,12 @@
<textElement verticalAlignment="Middle"/>
<text><![CDATA[Způsob dopravy:]]></text>
</staticText>
<textField pattern="dd. MM. yyyy">
<textField pattern="dd. MM. yyyy" isBlankWhenNull="true">
<reportElement uuid="3e101c47-cc46-4174-9209-ac566d486bfa" x="93" y="195" width="100" height="20"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
</textField>
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="5da8f5e3-f03d-48ed-becd-63564f646da6" x="388" y="195" width="173" height="20"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{deliveryType}]]></textFieldExpression>
@ -368,9 +261,9 @@
</band>
</pageHeader>
<detail>
<band height="64" splitType="Stretch">
<band height="63" splitType="Stretch">
<subreport>
<reportElement uuid="f584d121-262a-4149-bd05-b8c6bb15d93a" x="0" y="0" width="573" height="63"/>
<reportElement uuid="f584d121-262a-4149-bd05-b8c6bb15d93a" x="-1" y="0" width="574" height="63"/>
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{items})]]></dataSourceExpression>
<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "orderItems.jasper"]]></subreportExpression>
</subreport>
@ -378,7 +271,7 @@
</detail>
<summary>
<band height="101" splitType="Stretch">
<textField>
<textField isBlankWhenNull="true">
<reportElement uuid="751eb3dc-1e2d-4bd9-9d09-a307aaf383b9" x="10" y="0" width="551" height="20"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
@ -413,11 +306,16 @@
<reportElement uuid="98129acb-e148-489d-ae4e-cbe9bd580054" x="572" y="0" width="1" height="101"/>
</line>
<line>
<reportElement uuid="4520dd4e-f1d2-49e6-a539-8ce0a58a6d55" x="0" y="0" width="1" height="101"/>
<reportElement uuid="4520dd4e-f1d2-49e6-a539-8ce0a58a6d55" x="-1" y="0" width="1" height="101"/>
</line>
<line>
<reportElement uuid="28c4da74-c350-4bac-a918-7da9c4703f35" x="1" y="100" width="571" height="1"/>
<reportElement uuid="28c4da74-c350-4bac-a918-7da9c4703f35" x="0" y="100" width="572" height="1"/>
</line>
<textField isBlankWhenNull="true">
<reportElement uuid="ae10698c-46ba-4297-9cce-e31f7fb46c37" x="78" y="36" width="147" height="20"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{ownedBy}]]></textFieldExpression>
</textField>
</band>
</summary>
</jasperReport>

BIN
src/main/webapp/WEB-INF/reports/orderItems.jasper
View File

Binary file not shown.

66
src/main/webapp/WEB-INF/reports/orderItems.jrxml
Unescape Escape View File

@ -1,44 +1,22 @@
<?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="orderItems" pageWidth="572" pageHeight="752" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="232c2ae2-9163-4417-91b4-28c74f8bc41f">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="117"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<queryString>
<![CDATA[]]>
</queryString>
<field name="quantity" class="java.math.BigDecimal">
<fieldDescription><![CDATA[quantity]]></fieldDescription>
</field>
<field name="reqItem" class="info.bukova.isspst.data.RequirementItem">
<fieldDescription><![CDATA[reqItem]]></fieldDescription>
</field>
<field name="textItem" class="java.lang.String">
<fieldDescription><![CDATA[textItem]]></fieldDescription>
</field>
<field name="total" class="java.math.BigDecimal">
<fieldDescription><![CDATA[total]]></fieldDescription>
</field>
<field name="unitPrice" class="java.math.BigDecimal">
<fieldDescription><![CDATA[unitPrice]]></fieldDescription>
</field>
<field name="code" class="java.lang.String">
<fieldDescription><![CDATA[code]]></fieldDescription>
</field>
<field name="description" class="java.lang.String">
<fieldDescription><![CDATA[description]]></fieldDescription>
</field>
<field name="name" class="java.lang.String">
<fieldDescription><![CDATA[name]]></fieldDescription>
</field>
<field name="munit" class="info.bukova.isspst.data.MUnitEmb">
<fieldDescription><![CDATA[munit]]></fieldDescription>
</field>
<field name="reqItem.requirement" class="info.bukova.isspst.data.Requirement">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="reqItem.requirement.numser" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
<field name="quantity" class="java.math.BigDecimal"/>
<field name="reqItem" class="info.bukova.isspst.data.RequirementItem"/>
<field name="textItem" class="java.lang.String"/>
<field name="total" class="java.math.BigDecimal"/>
<field name="unitPrice" class="java.math.BigDecimal"/>
<field name="code" class="java.lang.String"/>
<field name="description" class="java.lang.String"/>
<field name="name" class="java.lang.String"/>
<field name="munit" class="info.bukova.isspst.data.MUnitEmb"/>
<field name="reqItem.requirement" class="info.bukova.isspst.data.Requirement"/>
<field name="reqItem.requirement.numser" class="java.lang.String"/>
<variable name="total_1" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{total}]]></variableExpression>
</variable>
@ -85,13 +63,13 @@
<text><![CDATA[Evid. číslo]]></text>
</staticText>
<line>
<reportElement uuid="7a610025-5225-4edc-8c61-606f11c0c734" x="0" y="-1" width="572" height="1"/>
<reportElement uuid="7a610025-5225-4edc-8c61-606f11c0c734" x="0" y="-1" width="574" height="1"/>
</line>
<line>
<reportElement uuid="d261353b-5a05-4a7c-8c3d-047d439ec7a8" x="0" y="19" width="572" height="1"/>
<reportElement uuid="d261353b-5a05-4a7c-8c3d-047d439ec7a8" x="0" y="19" width="574" height="1"/>
</line>
<line>
<reportElement uuid="8368adc5-eb29-4a21-be1e-c69f23bf29cd" x="0" y="26" width="572" height="1"/>
<reportElement uuid="8368adc5-eb29-4a21-be1e-c69f23bf29cd" x="0" y="26" width="574" height="1"/>
</line>
<line>
<reportElement uuid="1d567e2b-7310-442b-85f8-d8cce99f0c9d" x="40" y="-1" width="1" height="20"/>
@ -115,7 +93,7 @@
<reportElement uuid="db54b0b0-067a-40ce-a288-0f67169bfaf7" x="0" y="0" width="1" height="26"/>
</line>
<line>
<reportElement uuid="74461cb9-9924-4781-afb0-cbd229839c29" x="571" y="0" width="1" height="26"/>
<reportElement uuid="74461cb9-9924-4781-afb0-cbd229839c29" x="573" y="0" width="1" height="26"/>
</line>
</band>
</columnHeader>
@ -128,14 +106,14 @@
</textElement>
<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00 ¤" isBlankWhenNull="true">
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="d3c2c155-3cf9-4a5f-afc0-2353aa2ea2f5" x="80" y="0" width="65" height="25"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<paragraph rightIndent="3"/>
</textElement>
<textFieldExpression><![CDATA[$F{unitPrice}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00 ¤" isBlankWhenNull="true">
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="7dc10ede-575b-44e1-90dd-9edb5cc861d7" x="145" y="0" width="65" height="25"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<paragraph rightIndent="3"/>
@ -159,7 +137,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{reqItem.requirement.numser}]]></textFieldExpression>
</textField>
<textField>
<textField pattern="###0.00;-###0.00">
<reportElement uuid="f88606ec-20c8-4b7f-87eb-1bb2b0faff51" x="40" y="0" width="40" height="25"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<paragraph rightIndent="3"/>
@ -167,7 +145,7 @@
<textFieldExpression><![CDATA[$F{quantity}]]></textFieldExpression>
</textField>
<line>
<reportElement uuid="6b2c370e-10df-43a1-b308-c18e458e93ca" x="0" y="25" width="572" height="1"/>
<reportElement uuid="6b2c370e-10df-43a1-b308-c18e458e93ca" x="0" y="25" width="574" height="1"/>
</line>
<line>
<reportElement uuid="521a7bd8-2133-4c71-a7a7-b141ad327e8c" x="40" y="0" width="1" height="25"/>
@ -191,7 +169,7 @@
<reportElement uuid="56f4f5a8-8994-49fb-86c4-af3c73e714d1" x="480" y="0" width="1" height="25"/>
</line>
<line>
<reportElement uuid="23bf9770-5a80-4f31-8fdc-3793db61ae25" x="571" y="0" width="1" height="25"/>
<reportElement uuid="23bf9770-5a80-4f31-8fdc-3793db61ae25" x="573" y="0" width="1" height="25"/>
</line>
</band>
</detail>
@ -227,7 +205,7 @@
<reportElement uuid="19a87388-8b81-48fb-b60b-ef3fe1facdc1" x="0" y="0" width="1" height="21"/>
</line>
<line>
<reportElement uuid="40a7693c-6392-457a-830c-a8e8a5881add" x="571" y="0" width="1" height="21"/>
<reportElement uuid="40a7693c-6392-457a-830c-a8e8a5881add" x="573" y="0" width="1" height="21"/>
</line>
</band>
</summary>

Write Preview
Loading…
Cancel
Save