#5540 Add barcode and select proper HU

#5540 Implement receipt CU Label
metasfresh · Sep 17, 2019 · 9134cf0 · 9134cf0
1 parent 2ae69e7
commit 9134cf0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/...e.metas.fresh.base/src/main/jasperreports/de/metas/docs/label/halbfabrikat/label_cu.jrxml b/...e.metas.fresh.base/src/main/jasperreports/de/metas/docs/label/halbfabrikat/label_cu.jrxml
@@ -140,6 +140,14 @@ ORDER BY value
 				</textElement>
 				<textFieldExpression><![CDATA[$F{purchaseorderno}]]></textFieldExpression>
 			</textField>
+			<image scaleImage="FillFrame" hAlign="Center">
+				<reportElement x="57" y="18" width="150" height="30" uuid="4c59c717-7ffb-4ef1-a464-b2f0d1c9b59b">
+					<printWhenExpression><![CDATA[new Boolean($F{value} != null)]]></printWhenExpression>
+				</reportElement>
+				<imageExpression><![CDATA[new java.net.URL( $P{barcodeURL} + "?Content=" +
+$F{value} +
+"&Format=CODE_128&Width=300&Height=60" )]]></imageExpression>
+			</image>
 		</band>
 	</detail>
 </jasperReport>
diff --git a/....metas.fresh.base/src/main/jasperreports/de/metas/docs/label/halbfabrikat/report_cu.jrxml b/....metas.fresh.base/src/main/jasperreports/de/metas/docs/label/halbfabrikat/report_cu.jrxml
@@ -6,7 +6,7 @@
 	<property name="ireport.zoom" value="0.9090909090909096"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="metasfresh"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="mf15"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -20,21 +20,20 @@
 	</parameter>
 	<queryString>
 		<![CDATA[SELECT
-	tu.M_HU_ID as TU_ID
+	hui.M_HU_ID
 FROM
-	M_HU lu
-	JOIN M_HU_Item lui ON lu.M_HU_ID = lui.M_Hu_ID AND lui.isActive = 'Y'
-	JOIN M_HU_PI_Item lupii ON lui.M_HU_PI_Item_ID = lupii.M_HU_PI_Item_ID AND lupii.ItemType != 'PM' AND lupii.isActive = 'Y'
-	JOIN M_HU tu ON lui.M_HU_Item_ID = tu.M_HU_Item_Parent_ID
+	M_HU_Item hui
 WHERE
-	lu.M_HU_ID IN (
+	hui.M_HU_Item_ID IN (
 		SELECT	T_Selection_ID
 		FROM	T_Selection
 		WHERE	AD_PInstance_ID = $P{AD_PInstance_ID}
 	)
 ;]]>
 	</queryString>
-	<field name="tu_id" class="java.math.BigDecimal"/>
+	<field name="m_hu_id" class="java.math.BigDecimal">
+		<property name="com.jaspersoft.studio.field.label" value="m_hu_id"/>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -56,7 +55,7 @@ WHERE
 			<subreport>
 				<reportElement x="0" y="0" width="226" height="136" uuid="78737599-f189-4137-9b45-bceb4f1176ff"/>
 				<subreportParameter name="M_HU_ID">
-					<subreportParameterExpression><![CDATA[$F{tu_id}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$F{m_hu_id}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="barcodeURL">
 					<subreportParameterExpression><![CDATA[$P{barcodeURL}]]></subreportParameterExpression>