changed by sankara on 12/12/13 update wagenerationprc source given by pragyan...

changed by sankara on 12/12/13 update wagenerationprc source given by pragyan and xdl,jr.xml,sql given by sabitha


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

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -821,7 +821,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						
 						if(directPickLoc != null && directPickLoc.length() > 0)
 						{
-							pstmtStock = conn.prepareStatement(sSQL + orderByStkStr);
+							//changed by pragyan on 12/12/13 for bug fixing.
+							//pstmtStock = conn.prepareStatement(sSQL + orderByStkStr);
+							pstmtStock = conn.prepareStatement(sSQL + minMaxSql +orderByStkStr);
 							pstmtStock.setString(1,"Y");
 							pstmtStock.setString(2,rs.getString(6));
 							pstmtStock.setString(3,rs.getString(12));
@@ -4638,6 +4640,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		double palletVolume = 0.0 ,packSize = 0.0, perItemVolume = 0.0,
 		caseVolume = 0.0,packSize1 = 0.0,caseVolume1 = 0.0,
 		caseWeight =0.0,itemWeight = 0.0,caseCount =0.0;
+		//Changed By Pragyan 06-DEC-13 to get Stock alloc quantity as per KB sir
+		double stkAllocQty = 0.0;
 		String hazardous = "";
 		
 		try
@@ -4767,7 +4771,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						   +"(STOCK.QUANTITY - STOCK.ALLOC_QTY - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) AS QTY_AVAIL_ALLOC ,"
 						   +"STOCK.GRADE,STOCK.EXP_DATE,STOCK.CONV__QTY_STDUOM,STOCK.QUANTITY, " 					   
 						   +"STOCK.MFG_DATE,STOCK.SITE_CODE__MFG, "
-						   +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF " 
+						   //Changed By Pragyan 06-DEC-13 to get Stock alloc quantity as per KB sir
+						   //+"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF " 
+						    +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF,STOCK.ALLOC_QTY " 
 						   +"FROM STOCK,ITEM,LOCATION,INVSTAT " 
 						   +"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
 						   +"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
@@ -4828,7 +4834,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						   +"(STOCK.QUANTITY - STOCK.ALLOC_QTY - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) AS QTY_AVAIL_ALLOC ,"
 						   +"STOCK.GRADE,STOCK.EXP_DATE,STOCK.CONV__QTY_STDUOM,STOCK.QUANTITY, " 					   
 						   +"STOCK.MFG_DATE,STOCK.SITE_CODE__MFG, "
-						   +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF " 
+						   //Changed By Pragyan 06-DEC-13 to get Stock alloc quantity as per KB sir
+						  // +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF " 
+						  	+"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF,STOCK.ALLOC_QTY " 
 						   +"FROM STOCK,ITEM,LOCATION,INVSTAT " 
 						   +"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
 						   +"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
@@ -4964,7 +4972,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						   //Changed By Pragyan
 						   // +"STOCK.MFG_DATE,STOCK.SITE_CODE__MFG "
 						   +"STOCK.MFG_DATE,STOCK.SITE_CODE__MFG, "
-						   +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF "  //Changes done by chandni 08-06-12(instead of loc_type, loc_type__parent should be selected)
+						   //Changed By Pragyan 06-DEC-13 to get Stock alloc quantity as per KB sir
+						  // //+"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF "  //Changes done by chandni 08-06-12(instead of loc_type, loc_type__parent should be selected)
+						   +"STOCK.NO_ART,INVSTAT.INV_STAT,ITEM.LOC_TYPE__PARENT,ITEM.LOC_TYPE,ITEM.LOC_ZONE__PREF,STOCK.ALLOC_QTY "  
 						   +"FROM STOCK,ITEM,LOCATION,INVSTAT " 
 						   +"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
 						   +"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
@@ -5104,6 +5114,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//Changed by sankara on 03-08-2012 for adding locType
 				locType= rs.getString(15);
 				locZonePref = rs.getInt(16);
+				//Changed By Pragyan 06-DEC-13 to get Stock alloc quantity as per KB sir
+				stkAllocQty = rs.getDouble(17);
 				/*
 				invallocTrace.setRefSer("S-ALC");
 				invallocTrace.setRefId(saleOrder);
@@ -5254,9 +5266,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					//Changed By Pragyan 09/11/12 To make the stock to dock if avilable quantity less then or equal to required quantity(only reserve locatio).start
 					
 					if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated > packSizeActive) && "Y".equalsIgnoreCase(isStockToDockChecked))
+					{
+						////Changed By Pragyan 06-DEC-13 to get Stock alloc quantity exist then stock to dock should not be considered as per KB sir.start
+						//isStockToDock = true;
+						if(stkAllocQty > 0)
+						{
+							isStockToDock = false;
+						}
+						else
 						{
 							isStockToDock = true;
 						}
+						//Changed By Pragyan 06-DEC-13 to get Stock alloc quantity then stock to dock should not be considered as per KB sir.start
+					}
 					//Changed By Pragyan 09/11/12 To make the stock to dock if avilable quantity less then or equal to required quantity(only reserve locatio).end
 				}
 				else
@@ -5267,6 +5289,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//invallocTrace.setAllocQty(lotQtyToBeAllocated);	
 				//	
 				
+				System.out.println("Stock To Dock change["+isStockToDock+"]");
+								
 				allocQty -= lotQtyToBeAllocated ;
 				
 				System.out.print("AllocQty = " + lotQtyToBeAllocated);
@@ -14543,8 +14567,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			}
 			else
 			{
-				pstmt.setString(1, "00");
-				pstmt.setString(2, "ZZ");
+				//Changed By Pragyan 05-DEC-13 as per KB sir in case of blank lot no take the data for max of lot_no__to.start
+				/*pstmt.setString(1, "00");
+				pstmt.setString(2, "ZZ");*/
+				return dataVolumeMap = getItemVoumeMap(itemCode, con);
+				//Changed By Pragyan 05-DEC-13 as per KB sir in case of blank lot no take the data for max of lot_no__to.end
 			}
 			pstmt.setString(3, itemCode);
 			rs = pstmt.executeQuery();
@@ -14639,6 +14666,120 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		return dataVolumeMap;
 	}
 	
+	//Changed By Pragyan 05-DEC-13 as per KB sir thr may be chance to have more then on lot no in item lot pack size.strat
+	private HashMap getItemVoumeMap(String itemCode,Connection con)throws Exception
+	{
+		double packSize = 0,itemSize = 0,lotSize = 0;
+		PreparedStatement pstmt = null;
+		String sql="",hazardous = "";
+		String harmonizCode = "",harmonizDescr = "",originCountry = "";
+		ResultSet rs = null;
+		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,lotWeight = 0;
+		HashMap dataVolumeMap = new HashMap();
+		
+				System.out.println("As Lot No Passed as Blank Calling Override method for getItemVoumeMap");
+		try {
+			
+			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,I.HAZARDOUS HAZARD, " 
+				  +" I.HARMONIZATION_NO HARMONIZATION_NO,I.HARMONIZATION_DESCR HARMONIZATION_DESCR,I.COUNT_CODE__MFG ORIGIN_COUNTRY,"
+				  +" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM"
+				  +" ITEM I,ITEM_LOT_PACKSIZE L"
+				  +" WHERE I.ITEM_CODE = L.ITEM_CODE"
+				  +" AND L.LOT_NO__TO IN (SELECT MAX(LOT_NO__TO) FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ?)"
+				  +" AND  I.ITEM_CODE = ?";
+				  
+			
+			pstmt = con.prepareStatement(sql);
+			pstmt.setString(1, itemCode);
+			pstmt.setString(2, itemCode);
+			
+			rs = pstmt.executeQuery();
+			
+			if(rs.next())
+			{
+				itmLen = rs.getDouble("ITEM_LEN");
+				itmWidth = rs.getDouble("ITEM_WID");
+				itmHeight = rs.getDouble("ITEM_HEIGHT");
+				itemWeight = rs.getDouble("ITEM_WEIGHT");
+				//Changed By Pragyan 12/03/13 To set hazardous item check
+				hazardous = rs.getString("HAZARD");
+				lotLen = rs.getDouble("LITEM_LEN");
+				lotWidth = rs.getDouble("LITEM_WID");
+				lotHeight = rs.getDouble("LITEM_HEIGHT");				
+				packSize = rs.getDouble("SHIPSIZE");				
+				lotWeight = rs.getDouble("LOT_WEIGHT");
+				harmonizCode = rs.getString("HARMONIZATION_NO");
+				harmonizDescr = rs.getString("HARMONIZATION_DESCR");
+				originCountry = rs.getString("ORIGIN_COUNTRY");
+			}
+			itemSize = itmLen * itmWidth * itmHeight;
+			lotSize = lotHeight * lotWidth * lotLen;
+			
+			dataVolumeMap.put("PACK_SIZE", packSize);
+			dataVolumeMap.put("ITEM_SIZE", itemSize);
+			dataVolumeMap.put("LOT_SIZE", lotSize);
+			dataVolumeMap.put("HAZARDOUS", hazardous);
+			dataVolumeMap.put("ITEM_WEIGHT", itemWeight);
+			dataVolumeMap.put("PACK_WEIGHT", lotWeight);
+			dataVolumeMap.put("HARMONIZATION_NO", harmonizCode);
+			dataVolumeMap.put("HARMONIZATION_DESCR", harmonizDescr);
+			dataVolumeMap.put("ORIGIN_COUNTRY", originCountry);
+			dataVolumeMap.put("ITEM_LEN", itmLen);
+			dataVolumeMap.put("ITEM_WID", itmWidth);
+			dataVolumeMap.put("ITEM_HEIGHT", itmHeight);
+			dataVolumeMap.put("LITEM_LEN", lotLen);
+			dataVolumeMap.put("LITEM_WID", lotWidth);
+			dataVolumeMap.put("LITEM_HEIGHT", lotHeight);
+		
+			
+			
+			
+			if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+		
+			}
+			if(rs != null)
+			{
+				rs.close();
+				rs = null;
+		
+			}
+			
+			
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+
+			throw e;
+		}
+		finally
+		{
+			try
+			{
+				if(pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+			
+				}
+				if(rs != null)
+				{
+					rs.close();
+					rs = null;
+			
+				}
+			}
+			catch(Exception e)
+			{
+				throw e;
+			}
+		}
+		
+		return dataVolumeMap;
+	}
+	//Changed By Pragyan 05-DEC-13 as per KB sir thr may be chance to have more then on lot no in item lot pack size.end
 	
 	private int getWaveTaskDetLineNo(String waveID,Connection con)throws Exception
 	{

webitm-wms/module-resource/jrxml/linux/d_tracking_details_of_ptcn.jrxml

@@ -4,13 +4,17 @@
 	<property name="ireport.x" value="469"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="as_ptcn" class="java.lang.String"/>
+	<parameter name="as_sordno" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT A.ptcn,A.tracking_no,A.CARTON_NO,sf_identity as menifest, c.sord_no,b.shipment_id,d.tran_name
 From Carton_master a,Ship_docs b, Despatch c,Transporter d
 Where a.ptcn        = b.ptcn
 and   b.shipment_id = c.shipment_id
 and   b.tran_code   = d.tran_code
-and   a.ptcn        = $P{as_ptcn}
+and   (instr((select var_value from disparm where prd_code='999999' and var_name = 'TRACKING_DETAILS_REF_SER'),a.ref_ser ) > 0)
+AND  (CASE WHEN nvl(TRIM('$P!{as_ptcn}'),'null') = 'null' AND nvl(TRIM('$P!{as_sordno}'),'null') = 'null' THEN '0' ELSE CASE WHEN nvl(TRIM('$P!{as_ptcn}'),'null') = 'null' THEN '1' ELSE a.PTCN END END)  
+     = (CASE WHEN nvl(TRIM('$P!{as_ptcn}'),'null') = 'null' AND nvl(TRIM('$P!{as_sordno}'),'null') = 'null' THEN '1' ELSE CASE WHEN nvl(TRIM('$P!{as_ptcn}'),'null') = 'null' THEN '1' ELSE '$P!{as_ptcn}' END END)
+AND  (CASE WHEN nvl(trim('$P!{as_sordno}'),'null') ='null'  THEN '1' ELSE c.sord_no END)  = (CASE WHEN nvl(trim('$P!{as_sordno}'),'null') ='null' THEN '1' ELSE '$P!{as_sordno}' END)
 order by A.ptcn]]>
 	</queryString>
 	<field name="PTCN" class="java.lang.String"/>
@@ -115,7 +119,7 @@ order by A.ptcn]]>
 					<textElement textAlignment="Center">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Menifest #]]></text>
+					<text><![CDATA[Manifest #]]></text>
 				</staticText>
 				<line>
 					<reportElement x="67" y="0" width="1" height="30"/>

webitm-wms/module-resource/sql/TRACKING_DETAILS_BY_PTCN_Disparm.SQL

+
+
+DELETE FROM DISPARM WHERE VAR_NAME IN('TRACKING_DETAILS_REF_SER') AND PRD_CODE ='999999';
+
+INSERT INTO DISPARM
+VALUES('999999','TRACKING_DETAILS_REF_SER','S','M-PACK,P-PICK,A-PICK','Rer ser defined for TRACKING DETAILS BY PTCN report',NULL,'17-AUG-2013','ANAND','ANAND');
+
+COMMIT;
\ No newline at end of file