Changed By Pragyan Parcel Picking /LTL to Master & Parcel covert and Repl confirmation

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

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

@@ -365,6 +365,10 @@ etc
 										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
 										//Changed by sumit on 29/12/12 display parcel pick allow
 										valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
+										valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
+										valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
+										valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
+										
 									}
 									//System.out.println("Hello sale_order__from4");
 								}
@@ -380,6 +384,9 @@ etc
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
 									//Changed by sumit on 29/12/12 display parcel pick allow
 									valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
+									valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
+									valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
+									valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
 									
 								}
 								
@@ -646,7 +653,7 @@ etc
 		String stockToDockAllow = "";
 		String parcelPackAllow = "";
 		String directPickLoc = "";
-		String oldPtcn = "";
+		String palletNo = "";
 		//Changed By Pragyan 25/feb/13 To change the validation with ship type
 		String  shipType = "";
 		String custCode = "";
@@ -871,7 +878,7 @@ etc
 					{
 						directPickLoc = checkNull(genericUtility.getColumnValue( "direct_pick_loc", currFormDataDom ));
 						int countLoc = 0;
-						if(directPickLoc.trim().length() > 0 )
+						if(directPickLoc != null && directPickLoc.trim().length() > 0 )
 						{
 							sql = 	"SELECT COUNT(*) FROM LOCATION WHERE LOC_CODE= ? AND DIRECT_PICK = ?" ;
 									
@@ -904,16 +911,19 @@ etc
 						}
 						
 					}
-					else if ( "ptcn_old".equalsIgnoreCase( childNodeName ) )
+					else if ( "pallet_no".equalsIgnoreCase( childNodeName ) )
 					{
-						oldPtcn = checkNull(genericUtility.getColumnValue( "ptcn_old", currFormDataDom ));
+						directPickLoc = checkNull(genericUtility.getColumnValue( "direct_pick_loc", currFormDataDom ));
+						palletNo = checkNull(genericUtility.getColumnValue( "pallet_no", currFormDataDom ));
 						int countLoc = 0;
-						if(oldPtcn != null && oldPtcn.trim().length() > 0 )
+						if(directPickLoc != null && directPickLoc.trim().length() > 0 )
+						{
+								if(palletNo != null && palletNo.trim().length() > 0 )
 								{
-							sql = 	"SELECT COUNT(*) FROM WAVE_TASK_DET WHERE PTCN = ?" ;
+									sql = 	"SELECT COUNT(*) FROM PALLET_NO WHERE PALLET_NO = ?" ;
 											
 									pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, oldPtcn);
+									pstmt.setString(1, palletNo);
 									rs = pstmt.executeQuery();
 									if( rs.next())
 									{					
@@ -922,7 +932,7 @@ etc
 										{
 											//errList.add( "STOCK2DOC" );
 											errFields.add( childNodeName.toLowerCase() );
-									errList.add( "INVSELPTCN" );
+											errList.add( "INVPLTNO1" );
 											//errFields.add( "" );
 										}
 									}
@@ -938,6 +948,13 @@ etc
 										pstmt = null;	
 									}
 								}
+								else
+								{
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "NVLPLTMND" );
+									
+								}
+						}
 						
 					}
 					//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.

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

@@ -4615,7 +4615,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		//Changed By Pragyan 26/02/13 To add direct Pick location for Master/Parcel converting from LTL.
 		String directPickLoc = "";
 		String sSQLIssHdr = "",sSQLIssDet = "",sSQlUpdWave = "";
-		String shipType = "",oldPtcn = "";
+		String shipType = "",sugPalletNo = "";
 		try
 		{
 			
@@ -4636,7 +4636,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			}
 			//Changed By Pragyan 28/02/12 To sel the pallet no from old PTCN
 			directPickLoc = genericUtility.getColumnValue("direct_pick_loc",headerDom);
-			oldPtcn = genericUtility.getColumnValue("ptcn_old",headerDom);
+			sugPalletNo = genericUtility.getColumnValue("pallet_no",headerDom);
 			shipType  = genericUtility.getColumnValue("ship_type",headerDom);;
 			casePickInv  = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
 			activePickInv  = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
@@ -6739,14 +6739,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									if(directPickLoc != null && directPickLoc.length() > 0)
 									{
 										issTranID = getTranId("w_case_pick", conn);
-										palletNo = getPalletNo(siteCode, lotNo, lotSl, itemCode,oldPtcn, conn);
-										
+										//palletNo = getPalletNo(siteCode, lotNo, lotSl, itemCode,oldPtcn, conn);
+										palletNo = sugPalletNo;
 										pstmtIssHdr.setString(1,issTranID);
 										pstmtIssHdr.setDate(2,orderDate);
 										pstmtIssHdr.setString(3,pickRefId);
 										pstmtIssHdr.setString(4,siteCode);
-										//pstmtIssHdr.setString(5,"Y");
-										pstmtIssHdr.setString(5,"N");
+										pstmtIssHdr.setString(5,"Y");
+										//pstmtIssHdr.setString(5,"N");
 										pstmtIssHdr.setDate(6,orderDate);
 										pstmtIssHdr.setString(7,chgUser);
 										pstmtIssHdr.setString(8,chgUser);
@@ -6754,8 +6754,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										pstmtIssHdr.setString(10,chgTerm);
 										pstmtIssHdr.setString(11,pickType);
 										pstmtIssHdr.setString(12,palletNo);
-										//pstmtIssHdr.setString(13,"Y");
-										pstmtIssHdr.setString(13,"");
+										pstmtIssHdr.setString(13,"Y");
+										//pstmtIssHdr.setString(13,"");
 										pstmtIssHdr.executeUpdate();
 										pstmtIssHdr.clearParameters();