Req id:[W16GSUN005]

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

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

@@ -488,7 +488,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							if(PalletLotAWMSCount > 0)
 							{
 								System.out.println("Pallet No still in transist, in both  table :::::::::: ");
-								errCode = "VTINOUTTR";		
+								errCode = "VTINOUTIT";	//VTINOUTTR	
 								errList.add( errCode );
 								errFields.add(childNodeName.toLowerCase());
 								break;
@@ -498,7 +498,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							if(PalletLotQty > 0)
 							{
 								System.out.println("Pallet is not empty checked from tables::::::::: ");
-								errCode = "VTINOUTQT";//PALLET_HDR,'Y' swms_to_awms 'Y' quantity check
+								errCode = "VTITEMTQT";//PALLET_HDR,'Y' swms_to_awms 'Y' quantity check VTINOUTQT
 								errList.add( errCode );
 								errFields.add(childNodeName.toLowerCase());
 								break;

webitm-wms/ibase/webitm/utility/wms/ScheduleAWMSInOutTasks.java

@@ -236,6 +236,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
 
 		double quantity = 0,allocQty = 0,distOrderAlloc = 0,sordAllocQty = 0;
 		int updCnt = 0,lineNo = 0,countDso = 0,countInLoc = 0;
+		boolean checkRecord =false;//Added by Jagruti Shinde Req id:[W16GSUN005]
 
 		//HashMap hashMap = new HashMap(); 
 
@@ -565,9 +566,16 @@ public class ScheduleAWMSInOutTasks implements Schedule
 				isStkConf = true;//Changed by wasim on 12-07-2016
 				System.out.println("@@[PZ] Error while stock transfer confirm"+isStkConf);
 
-				System.out.println("Inside record exist block------------");//CONFSUCC
+				//Changed by Jagruti Shinde Req id:[W16GSUN005][Start]
+				System.out.println("Before checkCountPalletReq for--------------["+tranID+"]refId["+refId);
+				checkRecord = checkCountPalletReq(refId,conn);
+				System.out.println("Acknowlegement recieved for all items="+checkRecord);
+				if(checkRecord)
+				{
+					System.out.println("Before StockTransferConf------------");//CONFSUCC
 					StockTransferConf stkConf = new StockTransferConf();
 					errString = stkConf.confirm(tranID, xtraParams, "", conn, false);
+					System.out.println("After StockTransferConf-------------");
 
 					System.out.println("Return String from stock transfer===="+errString);//CONFSUCC
 
@@ -596,6 +604,45 @@ public class ScheduleAWMSInOutTasks implements Schedule
 					}
 				}
 				else
+				{
+					conn.commit();
+					System.out.println("in else commit");
+				}
+
+				System.out.println("outside if else  block of checkRecord------------");//CONFSUC
+				/*System.out.println("Inside record exist block------------");//CONFSUCC
+			StockTransferConf stkConf = new StockTransferConf();
+			errString = stkConf.confirm(tranID, xtraParams, "", conn, false);*/
+
+
+				/*System.out.println("Return String from stock transfer===="+errString);//CONFSUCC
+
+				if( errString != null &&  errString.indexOf( "CONFSUCC" ) > -1)
+				{
+					errString = allocStockLocCodeTo(allocList,false,conn);
+					System.out.println("Return from alloc To="+errString);
+
+					if(errString != null &&  (errString.indexOf("CONFSTKSUCC") > -1))
+					{	
+						if ("PZ".equalsIgnoreCase(refSer))
+						{
+							updateLocation(locationList,conn);
+							conn.commit();
+							System.out.println("Stock Transfer for PZ completed successfully and committed");
+						}
+					}
+					else
+					{
+						throw new Exception (errString);
+					}
+				}
+				else
+				{
+					throw new Exception (errString);
+				}*/
+				//Changed by Jagruti Shinde Req id:[W16GSUN005][END]
+			}
+			else
 			{
 				System.out.println("No data found in stock or Palletization detail is empty");
 				conn.rollback();