From e6e50dd2a1d8552ce75b733bd2eb8cdcb9e76e94 Mon Sep 17 00:00:00 2001
From: root <root@prod-erp-indoteknikcom.c.project-indoteknik-com.internal>
Date: Thu, 29 Aug 2024 15:31:16 +0700
Subject: modified jasper

---
 jasper_reports/custom_reports/logbook_sj.jrxml | 46 +++++++++++++++-----------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'jasper_reports/custom_reports/logbook_sj.jrxml')

diff --git a/jasper_reports/custom_reports/logbook_sj.jrxml b/jasper_reports/custom_reports/logbook_sj.jrxml
index 9cf38e4..388dbcb 100644
--- a/jasper_reports/custom_reports/logbook_sj.jrxml
+++ b/jasper_reports/custom_reports/logbook_sj.jrxml
@@ -48,6 +48,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Logbook_SJ_Line-report_logbook_sj_line/Departure_Date-departure_date"/>
 		<fieldDescription><![CDATA[/data/record/Logbook_SJ_Line-report_logbook_sj_line/Departure_Date-departure_date]]></fieldDescription>
 	</field>
+	<field name="Parent_name-parent_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Logbook_SJ_Line-report_logbook_sj_line/Customer-partner_id/Parent_name-parent_name"/>
+		<fieldDescription><![CDATA[/data/record/Logbook_SJ_Line-report_logbook_sj_line/Customer-partner_id/Parent_name-parent_name]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -120,7 +124,7 @@
 				<text><![CDATA[Customer]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="92" y="0" width="90" height="30" uuid="e9a6b68f-a462-4e5a-b3f5-c4f5102820fa"/>
+				<reportElement x="91" y="0" width="90" height="30" uuid="e9a6b68f-a462-4e5a-b3f5-c4f5102820fa"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -130,7 +134,7 @@
 				<text><![CDATA[No Picking]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="182" y="0" width="90" height="30" uuid="acd8a5fc-92b6-411c-909d-13f37dfb1efe"/>
+				<reportElement x="181" y="0" width="90" height="30" uuid="acd8a5fc-92b6-411c-909d-13f37dfb1efe"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -140,7 +144,7 @@
 				<text><![CDATA[No SO]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="273" y="0" width="90" height="30" uuid="cfbb56e7-92c7-4c14-acd0-b6e21aed682b"/>
+				<reportElement x="271" y="0" width="90" height="30" uuid="cfbb56e7-92c7-4c14-acd0-b6e21aed682b"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -150,7 +154,7 @@
 				<text><![CDATA[Driver]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="363" y="0" width="90" height="30" uuid="2e566559-f915-4dd7-b092-8a3bf382120d"/>
+				<reportElement x="361" y="0" width="90" height="30" uuid="2e566559-f915-4dd7-b092-8a3bf382120d"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -160,7 +164,7 @@
 				<text><![CDATA[Shipping Method]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="453" y="0" width="92" height="30" uuid="6d462229-750c-492f-a7d5-358097e8355a"/>
+				<reportElement x="451" y="0" width="92" height="30" uuid="6d462229-750c-492f-a7d5-358097e8355a"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -173,17 +177,6 @@
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField>
-				<reportElement x="1" y="0" width="90" height="30" uuid="b05a45f2-b836-488d-bef7-797cdce16ddf">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a6dc69da-7c59-4895-9302-1da41ffe990b"/>
-				</reportElement>
-				<box>
-					<topPen lineWidth="0.5"/>
-					<bottomPen lineWidth="0.5"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{Customer}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement x="91" y="0" width="91" height="30" uuid="1bab2b10-cbff-46d8-aead-2fe0604fcb5f">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="02c28e92-1108-4659-97c1-7a47f06e979e"/>
@@ -196,7 +189,7 @@
 				<textFieldExpression><![CDATA[$F{PO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="182" y="0" width="90" height="30" uuid="90affdf0-a109-4a5d-be7e-1444767d09cd">
+				<reportElement x="182" y="0" width="89" height="30" uuid="90affdf0-a109-4a5d-be7e-1444767d09cd">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="38404627-3374-4b80-bc1c-20fe87aab743"/>
 				</reportElement>
 				<box>
@@ -207,7 +200,7 @@
 				<textFieldExpression><![CDATA[$F{SO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="273" y="0" width="90" height="30" uuid="71463154-d00d-413e-a1a1-e2881d6ef809">
+				<reportElement x="271" y="0" width="90" height="30" uuid="71463154-d00d-413e-a1a1-e2881d6ef809">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="bfd8dec3-2bc9-4b38-a643-e18724aaf3ed"/>
 				</reportElement>
 				<box>
@@ -218,7 +211,7 @@
 				<textFieldExpression><![CDATA[$F{Driver}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="363" y="0" width="90" height="30" uuid="6d4b0665-5a7c-474e-b2f8-1acde0e36a06">
+				<reportElement x="361" y="0" width="90" height="30" uuid="6d4b0665-5a7c-474e-b2f8-1acde0e36a06">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="b92bdba1-3992-4940-874a-4159fa47e605"/>
 				</reportElement>
 				<box>
@@ -229,7 +222,7 @@
 				<textFieldExpression><![CDATA[$F{Shipping Method}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="453" y="0" width="92" height="30" uuid="465e4dce-f36e-4d61-9f26-4b1dea2d1cda">
+				<reportElement x="451" y="0" width="92" height="30" uuid="465e4dce-f36e-4d61-9f26-4b1dea2d1cda">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="3a1e60b9-75bb-4594-a1b1-13be9ad8219b"/>
 				</reportElement>
 				<box>
@@ -239,6 +232,19 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{Deparutre Date}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="1" y="0" width="90" height="30" uuid="afddf8fa-2f8e-4297-8ed6-3b624fb3330e">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ab32b878-aa1c-4663-8396-ecdab500a66c"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Parent_name-parent_name} != null && !$F{Parent_name-parent_name}.isEmpty() ? 
+			        $F{Parent_name-parent_name} : 
+			        $F{Customer}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
-- 
cgit v1.2.3