Changed by Rohan on 17-10-12 for hazmat report for windows

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91997 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/module-resource/jrxml/window jrxml/haz_mat_form.jrxml

@@ -13,12 +13,19 @@
 	<reportFont name="Report_Font" isDefault="false" fontName="Courier New" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 	<parameter name="PTCN" class="java.lang.String"/>
 	<queryString>
-		<![CDATA[SELECT T.PTCN AS PTCN,
+		<![CDATA[SELECT PTCN,TRACKING_NO,CARTON_NO,REF_SER,
+ROUND(GROSS_WEIGHT + (CASE WHEN REF_SER = 'M-PICK' THEN
+(SELECT NETT_WEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = CARTON_NO)) ELSE 0 END) / 2.20462262185 , 5) AS GROSS_WEIGHT,
+SHIP_DATE,SHIP_FROM,SHIP_ADD1,SHIP_ADD2,SHIP_ADD3,SHIP_CITY,
+SHIP_STATE_CODE,SHIP_PIN,CONSIGEE_NAME,CONSIGEE_ADD1,CONSIGEE_ADD2,CONSIGEE_ADD3,CONSIGEE_CITY,
+CONSIGEE_STATE_CODE,CONSIGEE_PIN,CONSIGEE_COUNT_CODE
+FROM
+(
+SELECT T.PTCN AS PTCN,
 T.TRACKING_NO AS TRACKING_NO,
 T.CARTON_NO AS CARTON_NO,
 T.REF_SER AS REF_SER,
-ROUND((SUM(T.GROSS_WEIGHT) + CASE WHEN T.REF_SER = 'M-PICK' THEN
-(SELECT NETT_WEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = T.CARTON_NO)) ELSE 0 END) / 2.20462262185 , 5) AS GROSS_WEIGHT,
+SUM(T.GROSS_WEIGHT) AS GROSS_WEIGHT,
 T.SHIP_DATE AS SHIP_DATE,
 T.SHIP_FROM AS SHIP_FROM,
 T.SHIP_ADD1 AS SHIP_ADD1,
@@ -36,20 +43,21 @@ T.CONSIGEE_STATE_CODE AS CONSIGEE_STATE_CODE,
 T.CONSIGEE_PIN AS CONSIGEE_PIN,
 T.CONSIGEE_COUNT_CODE AS CONSIGEE_COUNT_CODE
 FROM
-(SELECT WDET.PTCN,
-'' AS TRACKING_NO,
+(
+SELECT WDET.PTCN AS PTCN,
+' ' AS TRACKING_NO,
 CASE WHEN CM.MASTER_CARTON IS NULL THEN CM.CARTON_NO ELSE CM.MASTER_CARTON END AS CARTON_NO,
 WDET.REF_SER AS REF_SER,
 NVL((CASE WHEN WDET.REF_SER = 'C-PICK' OR WDET.REF_SER = 'M-PICK' THEN
-	(SELECT GROSS_WEIGHT FROM ITEM_LOT_PACKSIZE
-		WHERE PDET.ITEM_CODE = ITEM_LOT_PACKSIZE.ITEM_CODE
-		AND (PDET.LOT_NO >= ITEM_LOT_PACKSIZE.LOT_NO__FROM
-		AND PDET.LOT_NO <= ITEM_LOT_PACKSIZE.LOT_NO__TO))
-	ELSE PDET.QUANTITY * ITEM.GROSS_WEIGHT
-	END ),0)  AS GROSS_WEIGHT ,
+ (SELECT GROSS_WEIGHT FROM ITEM_LOT_PACKSIZE
+  WHERE PDET.ITEM_CODE = ITEM_LOT_PACKSIZE.ITEM_CODE
+  AND (PDET.LOT_NO >= ITEM_LOT_PACKSIZE.LOT_NO__FROM
+  AND PDET.LOT_NO <= ITEM_LOT_PACKSIZE.LOT_NO__TO))
+ ELSE PDET.QUANTITY * ITEM.GROSS_WEIGHT
+ END ),0)  AS GROSS_WEIGHT ,
 (SELECT DESPATCH.DESP_DATE FROM DESPATCH WHERE DESP_ID =
-	(SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_TASK_DET.REF_SER = 'S-DSP'
-		AND WAVE_TASK_DET.PTCN = WDET.PTCN) ) SHIP_DATE,
+ (SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_TASK_DET.REF_SER = 'S-DSP'
+  AND WAVE_TASK_DET.PTCN = WDET.PTCN) ) AS SHIP_DATE,
 SITE.DESCR AS SHIP_FROM,
 SITE.ADD1 AS SHIP_ADD1,
 SITE.ADD2 AS SHIP_ADD2,
@@ -85,10 +93,13 @@ AND DESPATCH.DESP_ID = (SELECT REF_ID FROM WAVE_TASK_DET WHERE REF_SER = 'S-DSP'
 AND SITE.SITE_CODE = DESPATCH.SITE_CODE
 AND CUSTOMER.CUST_CODE = DESPATCH.CUST_CODE__DLV
 AND DESPATCH.TRANS_MODE = 'A'
+AND CM.CARTON_NO <> NVL(CM.MASTER_CARTON , '**') 
+AND CASE WHEN CM.PALLET_NO IS NULL THEN NVL(CM.MASTER_CARTON,'**') ELSE CM.PALLET_NO END 
+IN (SELECT PALLET_NO FROM DESPATCHDET DD WHERE DD.DESP_ID = DESPATCH.DESP_ID AND DD.PALLET_NO = CASE WHEN CM.PALLET_NO IS NULL THEN NVL(CM.MASTER_CARTON,'**') ELSE CM.PALLET_NO END)
 ORDER BY CM.PICK_ORDER,CM.LINE_NO__PICK,CASE WHEN CM.MASTER_CARTON IS NULL THEN CM.CARTON_NO ELSE CM.MASTER_CARTON END
 ) T
 GROUP BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE,T.SHIP_DATE ,T.SHIP_FROM ,T.SHIP_ADD1 ,T.SHIP_ADD2 ,T.SHIP_ADD3 ,T.SHIP_CITY ,T.SHIP_STATE_CODE ,T.SHIP_PIN ,T.CONSIGEE_NAME ,T.CONSIGEE_ADD1 ,T.CONSIGEE_ADD2 ,T.CONSIGEE_ADD3 ,T.CONSIGEE_CITY ,T.CONSIGEE_STATE_CODE ,T.CONSIGEE_PIN ,T.CONSIGEE_COUNT_CODE
-ORDER BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE,T.SHIP_DATE ,T.SHIP_FROM ,T.SHIP_ADD1 ,T.SHIP_ADD2 ,T.SHIP_ADD3 ,T.SHIP_CITY ,T.SHIP_STATE_CODE ,T.SHIP_PIN ,T.CONSIGEE_NAME ,T.CONSIGEE_ADD1 ,T.CONSIGEE_ADD2 ,T.CONSIGEE_ADD3 ,T.CONSIGEE_CITY ,T.CONSIGEE_STATE_CODE ,T.CONSIGEE_PIN ,T.CONSIGEE_COUNT_CODE]]>
+ORDER BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE,T.SHIP_DATE ,T.SHIP_FROM ,T.SHIP_ADD1 ,T.SHIP_ADD2 ,T.SHIP_ADD3 ,T.SHIP_CITY ,T.SHIP_STATE_CODE ,T.SHIP_PIN ,T.CONSIGEE_NAME ,T.CONSIGEE_ADD1 ,T.CONSIGEE_ADD2 ,T.CONSIGEE_ADD3 ,T.CONSIGEE_CITY ,T.CONSIGEE_STATE_CODE ,T.CONSIGEE_PIN ,T.CONSIGEE_COUNT_CODE)]]>
 	</queryString>
 	<field name="PTCN" class="java.lang.String"/>
 	<field name="GROSS_WEIGHT" class="java.lang.Double"/>

webitm-wms/module-resource/jrxml/window jrxml/haz_mat_label.jrxml

@@ -13,12 +13,16 @@
 	<reportFont name="Report_Font" isDefault="false" fontName="Courier New" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 	<parameter name="PTCN" class="java.lang.String"/>
 	<queryString>
-		<![CDATA[SELECT T.PTCN AS PTCN,
+		<![CDATA[SELECT PTCN,TRACKING_NO,CARTON_NO,REF_SER,
+ROUND(GROSS_WEIGHT + (CASE WHEN REF_SER = 'M-PICK' THEN
+(SELECT NETT_WEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = CARTON_NO)) ELSE 0 END) / 2.20462262185 , 5) AS GROSS_WEIGHT,
+SHIP_DATE 
+FROM (
+SELECT T.PTCN AS PTCN,
 T.TRACKING_NO AS TRACKING_NO,
 T.CARTON_NO AS CARTON_NO,
 T.REF_SER AS REF_SER,
-ROUND((SUM(T.GROSS_WEIGHT) + CASE WHEN T.REF_SER = 'M-PICK' THEN
-(SELECT NETT_WEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = T.CARTON_NO)) ELSE 0 END) / 2.20462262185 , 5) AS GROSS_WEIGHT,
+SUM(T.GROSS_WEIGHT) AS GROSS_WEIGHT,
 T.SHIP_DATE AS SHIP_DATE
 FROM
 (
@@ -27,22 +31,22 @@ SELECT WDET.PTCN AS PTCN,
 CASE WHEN CM.MASTER_CARTON IS NULL THEN CM.CARTON_NO ELSE CM.MASTER_CARTON END AS CARTON_NO,
 WDET.REF_SER AS REF_SER,
 NVL((CASE WHEN WDET.REF_SER = 'C-PICK' OR WDET.REF_SER = 'M-PICK' THEN
-	(SELECT GROSS_WEIGHT FROM ITEM_LOT_PACKSIZE
-		WHERE PDET.ITEM_CODE = ITEM_LOT_PACKSIZE.ITEM_CODE
-		AND (PDET.LOT_NO >= ITEM_LOT_PACKSIZE.LOT_NO__FROM
-		AND PDET.LOT_NO <= ITEM_LOT_PACKSIZE.LOT_NO__TO))
-	ELSE PDET.QUANTITY * ITEM.GROSS_WEIGHT
-	END ),0)  AS GROSS_WEIGHT ,
+ (SELECT GROSS_WEIGHT FROM ITEM_LOT_PACKSIZE
+  WHERE PDET.ITEM_CODE = ITEM_LOT_PACKSIZE.ITEM_CODE
+  AND (PDET.LOT_NO >= ITEM_LOT_PACKSIZE.LOT_NO__FROM
+  AND PDET.LOT_NO <= ITEM_LOT_PACKSIZE.LOT_NO__TO))
+ ELSE PDET.QUANTITY * ITEM.GROSS_WEIGHT
+ END ),0)  AS GROSS_WEIGHT ,
 (SELECT DESPATCH.DESP_DATE FROM DESPATCH WHERE DESP_ID =
-	(SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_TASK_DET.REF_SER = 'S-DSP'
-		AND WAVE_TASK_DET.PTCN = WDET.PTCN) ) AS SHIP_DATE
-
+ (SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_TASK_DET.REF_SER = 'S-DSP'
+  AND WAVE_TASK_DET.PTCN = WDET.PTCN) ) AS SHIP_DATE
 FROM WAVE_TASK_DET WDET,
 CARTON_MASTER CM,
 PICK_ORD_DET PDET,
 ITEM,
 DESPATCH DESP
-WHERE WDET.PTCN = '$P!{PTCN}'
+WHERE 
+WDET.PTCN = '$P!{PTCN}'
 AND WDET.REF_SER IN ('C-PICK','A-PICK','M-PICK')
 AND PDET.PICK_ORDER = WDET.REF_ID
 AND CM.PICK_ORDER = PDET.PICK_ORDER
@@ -51,9 +55,12 @@ AND ITEM.ITEM_CODE = PDET.ITEM_CODE
 AND DESP.DESP_ID = (SELECT REF_ID FROM WAVE_TASK_DET WHERE REF_SER = 'S-DSP' AND PTCN = WDET.PTCN)
 AND NVL(ITEM.HAZARDOUS , 'N') = 'Y'
 AND DESP.TRANS_MODE = 'A'
+AND CM.CARTON_NO <> NVL(CM.MASTER_CARTON , '**') 
+AND CASE WHEN CM.PALLET_NO IS NULL THEN NVL(CM.MASTER_CARTON,'**') ELSE CM.PALLET_NO END 
+IN (SELECT PALLET_NO FROM DESPATCHDET DD WHERE DD.DESP_ID = DESP.DESP_ID AND DD.PALLET_NO = CASE WHEN CM.PALLET_NO IS NULL THEN NVL(CM.MASTER_CARTON,'**') ELSE CM.PALLET_NO END)
 ORDER BY CM.PICK_ORDER,CM.LINE_NO__PICK,CASE WHEN CM.MASTER_CARTON IS NULL THEN CM.CARTON_NO ELSE CM.MASTER_CARTON END) T
 GROUP BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE
-ORDER BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE
+ORDER BY T.PTCN,T.CARTON_NO,T.TRACKING_NO,T.REF_SER,T.SHIP_DATE)
 ]]>
 	</queryString>
 	<field name="PTCN" class="java.lang.String"/>