changes commited

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

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

@@ -157,6 +157,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 		ADSIShippingSoap  soap = null;
 		List arryOuterCartonNo = new ArrayList();
 		LinkedHashMap linkedMap = new LinkedHashMap();
+		ArrayList ptcnList = new ArrayList();
 		
 		try
 		{
@@ -181,7 +182,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 			pstmtPrintStatus = conn.prepareStatement(sqlPrintStatus);
 			
 			//sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
-			sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS,CHANGE_STATUS,MSN_NO,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
+			sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS,CHANGE_STATUS,MSN_NO,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME,CARTON_TYPE FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
 			pstmtMaster = conn.prepareStatement(sqlMaster);
 			
 			sqlCrtnChg = "UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE PTCN = ?";
@@ -263,6 +264,14 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 				pstmt.close(); pstmt = null;				*/
 				//This check is not required for testing.end
 				
+				if(ptcnList.contains(ptcn))
+				{
+					continue;
+				}
+				else
+				{
+					ptcnList.add(ptcn);
+				}
 				
 				
 						pstmtPrintStatus.setString(1, ptcn);
@@ -333,6 +342,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 								chgStatus = rsMaster.getString("CHANGE_STATUS");
 								oldMsnNo =  rsMaster.getLong("MSN_NO");
 								oldCarrierSymbol =  rsMaster.getString("CARRIER_SYMBOL");
+								refType =  rsMaster.getString("CARTON_TYPE");
+								
 								System.out.println("parcelCartonNo ["+parcelCartonNo+"]CARRIER_SYMBOL["+oldCarrierSymbol+"]["+oldMsnNo+"]Change Status["+chgStatus+"]");
 								
 								if("M".equalsIgnoreCase(refType))
@@ -983,7 +994,23 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 			}
 			else
 			{
-				return "NO";
+				
+				sql = "SELECT T.TRAN_CODE,T.SERVICE_CODE FROM DESPATCH D,WAVE_TASK_DET W,TRANSPORTER T "
+				+" WHERE D.DESP_ID = W.REF_ID AND W.REF_SER='S-DSP'" 
+				+" AND T.TRAN_CODE = D.TRAN_CODE AND W.PTCN = ?";
+				
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, ptcn);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					shipTranCode = rs.getString("TRAN_CODE");
+					serviceCode = rs.getString("SERVICE_CODE");
+				}
+				else
+				{
+					return "NO";
+				}
 			}
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;

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

@@ -2635,14 +2635,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 	
 	private boolean isManualAllocStock(String saleOrder,String lineNoSord,Connection conn) throws ITMException
 	{
-		String sql = "";
+		String sql = "",updateSql = "";
 		String sqlShipStanCode = "";
 		ResultSet rs = null;
-		PreparedStatement pstmt = null;
+		PreparedStatement pstmt = null,pstmtUpd = null;
 		boolean isManAlloc = false;
 		try
 		{
-				 		 
+			
+			updateSql = "UPDATE SORDALLOC SET WAVE_FLAG = 'N' WHERE SALE_ORDER = ? AND LINE_NO = ? AND ALLOC_MODE ='M' ";
+			pstmtUpd = conn.prepareStatement(updateSql);
+			pstmtUpd.setString(1, saleOrder);
+			pstmtUpd.setString(2, lineNoSord);
+			
 			sql = " SELECT * FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? AND ALLOC_MODE ='M' ";
 				
 			pstmt = conn.prepareStatement(sql);
@@ -2653,10 +2658,42 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 			if (rs.next())
 			{
 				isManAlloc = true;
+				
+				
 			}
 			
+			if(isManAlloc)
+			{
+				int count = pstmtUpd.executeUpdate();
+				
+				if(count > 0)
+				{
+					System.out.println("Update count["+count+"]");
+				}
+				
+				
+			}
+			
+			
+			if(rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			
+			if(pstmtUpd != null)
+			{
+				pstmtUpd.close();
+				pstmtUpd = null;
+				
+			}
 		
-		
+			if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+				
+			}
 		}
 		catch(Exception e)
 		{

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

@@ -10441,6 +10441,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					}
 					//Change by rekha on 21-05-13 end
 					
+					if(packgeList != null && packgeList.length > 0)
+					{
+						System.out.println("Setting Packages To Shipment In Master/Parcel["+packgeList.length+"]");
+						shipment2.setPackages2(packgeList);
+					}
 					
 				}
 				
@@ -11771,7 +11776,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.end
 					}
 					
-					if(actCartonWeightMap.size() > 0 && "Y".equalsIgnoreCase(pPickAllow))
+					if(actCartonWeightMap.size() > 0 && ("Y".equalsIgnoreCase(pPickAllow) || "Y".equalsIgnoreCase(mPackAllow)))
 					{
 						CommodityInfo[] infoCom = null;
 						String nafFlag = discommon.getDisparams("999999","NAFTA_FLAG_COUNT",conn);
@@ -11984,15 +11989,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						}
 					}
 					
+					if(packgeList != null && packgeList.length > 0)
+					{
+						System.out.println("Setting Packages To Shipment In actives["+packgeList.length +"]");
+						shipment2.setPackages2(packgeList);
+					}
+					
 				}				
 				
 				//change by rekha on 23-05-13 start
 				//if(packgeList.length != 0  || packgeList.length > 0)
 				//if("P".equalsIgnoreCase(waveMode) && packgeList != null && packgeList.length > 0)
-				if(packgeList != null && packgeList.length > 0)
-				{
-					System.out.println("Setting Packages To Shipment ["+packgeList.toString()+"]");
-					shipment2.setPackages2(packgeList);
+				//if(packgeList != null && packgeList.length > 0)
+				//{
+					/*System.out.println("Setting Packages To Shipment Finally["+packgeList.toString()+"]["+packgeList.length+"]");
+					shipment2.setPackages2(packgeList);*/
 					/*BASE64Decoder decoder = new BASE64Decoder();
 					Timestamp currDate = new Timestamp(System.currentTimeMillis());
 					
@@ -12318,7 +12329,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			   	 
 		    		}*/
 		    		
-				}
+				//}
 				
 				//change by rekha on 23-05-13 end