Changes Merging for DDWMS.

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

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

@@ -19,6 +19,12 @@ import org.w3c.dom.Document;
 
 public class ConsolidatToDoc {
 	GenericUtility genericUtility = GenericUtility.getInstance();
+	
+	//Changed by Manish on 05/11/15 [Start] 
+	String projectName = "";
+	DistCommon distCommon = new DistCommon();
+	//Changed by Manish on 05/11/15 [End]
+	
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 
 	//Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user
@@ -368,10 +374,31 @@ public class ConsolidatToDoc {
 										expLev = rs.getString("EXP_LEV");
 										lineNoSord = rs.getString("LINE_NO__SORD");//Gulzar on 12/28/2011	
 										//Changed by sumit on 12/03/13 calculating number of art start
+										
+										// Changed by Manish on 05/11/15 for DDWMS merging [start]
+										projectName = distCommon.getDisparams("999999","PROJECT",conn);
+										if("DDUK".equalsIgnoreCase(projectName))
+										{
+											if(lotNo == null || lotNo.trim().length() == 0)
+											{
+												lotNo ="               ";
+											}
+											if(lotSl == null || lotSl.trim().length()==0)
+											{
+												lotSl = "     ";
+											}
+										}
+										// Changed by Manish on 05/11/15 for DDWMS merging [end]
+										
 										HashMap itmVolumeMap = new HashMap();
 										itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
 										shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");
+										// Changed by Manish on 05/11/15 for DDWMS merging [start]
+										if(!"DDUK".equalsIgnoreCase(projectName))
+										{
 											noArt = (int) (quantity / shipperSize);
+										}
+										// Changed by Manish on 05/11/15 for DDWMS merging [end]
 										if( noArt == 0 )
 										{
 											noArt = 1;
@@ -491,7 +518,7 @@ public class ConsolidatToDoc {
 										}
 
 										System.out.println("pick/repl order ["+pickOrder.trim()+"] site code ["+siteCode.trim()+"] item code ["+itemCode.trim()+"] loc code ["+locCode.trim()+"]");
-										System.out.println("lot no ["+lotNo.trim()+"] lot sl["+lotSl.trim()+"] no art ["+noArt+"] quantity["+quantity+"] sale_order["+saleOrder.trim()+"]");
+										System.out.println("lot no ["+lotNo+"] lot sl["+lotSl+"] no art ["+noArt+"] quantity["+quantity+"] sale_order["+saleOrder.trim()+"]");
 
 										//Changes by gulzar on 29/12/11
 										//Form sorditem
@@ -849,8 +876,17 @@ public class ConsolidatToDoc {
 										}										
 
 										pstmt1.setString(7, itemCode.trim());
+										if("DDUK".equalsIgnoreCase(projectName))
+										{
+											pstmt1.setString(8, lotNo);
+											pstmt1.setString(9, lotSl);
+										}
+										else
+										{
 											pstmt1.setString(8, lotNo.trim());
 											pstmt1.setString(9, lotSl.trim());
+										}
+										
 										pstmt1.setDouble(10, quantityOrd);
 										//Changed by sumit on 01/02/13 inserting qty as per ordered unit
 										//pstmt1.setDouble(11, quantity);

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

@@ -232,7 +232,6 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
 			rs = pstmt.executeQuery();
 			while(rs.next())
 			{
-
 				itemCode = rs.getString( "item_code" );
 				siteCode = rs.getString( "site_code" );
 				locCode = rs.getString( "loc_code" );
@@ -249,6 +248,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
 				pickisstranId =   rs.getString( "TRAN_ID__ISS" );
 				System.out.println("pick type from hdr->> ["+pickType+"]");
 				System.out.println("tranIdissue->> ["+pickisstranId+"]");
+				System.out.println("lotNo->> ["+lotNo+"] lotSl : ["+lotSl+"]");
 				// 16/10/11 manoharan check whether allocation against sales order is there
 				// if allocation against sales order found change allocation to point to loc_code__to
 				// and deallocate the same for loc_code in stock

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

@@ -142,6 +142,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			//conn.setAutoCommit(false);
 			if("DDUK".equalsIgnoreCase(projectCode))
 			{
+				ptcn = palletNo ; 
 				sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.ptcn = ? AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString( 1, ptcn);

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

@@ -1583,7 +1583,8 @@ public class LocWisePickWizIC extends ValidatorEJB implements LocWisePickWizICLo
 							unit = rs.getString("UNIT");
 							noArt = rs.getDouble("NO_ART"); 
 
-							lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
+							lotNo = rs.getString("LOT_NO");
+							lpnNo = rs.getString("LOT_SL");//CHANGED @@
 							itmVolumeMap.clear();
 							itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
 							shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");

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

@@ -6,15 +6,18 @@ import ibase.webitm.ejb.*;
 import ibase.webitm.ejb.dis.*;
 import ibase.system.config.*;
 import ibase.webitm.utility.ITMException;
+import ibase.webitm.utility.wms.CommonWmsUtil;
 
 import java.io.*;
 import java.rmi.RemoteException;
 import java.sql.*;
 import java.util.*;
 import java.text.*;
+
 import javax.ejb.*;
 import javax.naming.InitialContext;
 import javax.ejb.Stateless; 
+
 import org.w3c.dom.*;
 
 import java.util.Date;
@@ -28,6 +31,10 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 	 * @param : tranId
 	 * @param : xtraParams
 	 */
+	
+	String projectName = ""; //Changed by wasim on 06-11-15 for DDUK project	
+	CommonWmsUtil commonWmsUtility = CommonWmsUtil.getInstance();
+	
 	public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
 	{
 		String retString = "";
@@ -170,6 +177,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 			dsoInvstat = discommon.getDisparams( "999999", "DEEP_STORE_INVSTAT", conn );
 			//Changed by Rohna on 25-03-13 for set Actual qty zero when repanishment confirm.end
 			
+			projectName = discommon.getDisparams("999999","PROJECT",conn);	//Changed by wasim on 06-11-15 for DDUK project
+
 			conn.setAutoCommit(false);
 
 			java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() );
@@ -286,8 +295,21 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					itemCode = checkNullAndTrim(rs.getString( "item_code" ));
 					siteCode = checkNullAndTrim(rs.getString( "site_code" ));
 					locCode = checkNullAndTrim(rs.getString( "loc_code" ));
+					//Changed by wasim on 22-06-2015 to remove checknullandtrim for DDUK[START]
+					if("DDUK".equalsIgnoreCase(projectName))
+					{
+						lotNo = rs.getString( "lot_no" );
+						lotSl = rs.getString( "lot_sl" );
+					}
+					else
+					{
 						lotNo = checkNullAndTrim(rs.getString( "lot_no" ));
 						lotSl = checkNullAndTrim(rs.getString( "lot_sl" ));
+					}
+					//lotNo = checkNullAndTrim(rs.getString( "lot_no" ));
+					//lotSl = checkNullAndTrim(rs.getString( "lot_sl" ));
+					//Changed by wasim on 22-06-2015 to remove checknullandtrim for DDUK [END]
+					
 					quantity = rs.getDouble( "quantity" );
 					noArt = rs.getDouble( "no_art" );
 					locCodeTo = checkNullAndTrim(rs.getString( "loc_code__to" ));
@@ -382,10 +404,14 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							System.out.println("Actual Quantity:="+actualQty);
 							System.out.println("Actual Allocate Quantity:="+actualAllocQty);*/
 							
-							if("V".equalsIgnoreCase(orderType))
+							//Changed by wasim on 06-11-2015 for DDUK project [START]
+							/*if("V".equalsIgnoreCase(orderType))
+							{*/
+							if("V".equalsIgnoreCase(orderType) && !"DDUK".equalsIgnoreCase(projectName))
 							{
 								actualQty = 0.0;
 							}
+							//Changed by wasim on 06-11-2015 for DDUK project [END]
 							else
 							{
 								actualQty = quantity - pickQty;
@@ -671,6 +697,31 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					/*sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?  " +
 								" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
 
+					//Changed by wasim on 06-11-2015 for DDUK project [START]
+					if("DDUK".equalsIgnoreCase(projectName))
+					{
+						sql = 	" SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+								+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+								+ " UNION ALL " 
+								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN ( " 
+								+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) " 
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 " 
+								+ " UNION ALL "
+								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN ( " 
+								+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+								+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y'  AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
+						pstmtPick = conn.prepareStatement(sql);
+						pstmtPick.setString(1, replOrder);	
+						pstmtPick.setInt(2, replOrderLineNo);	
+						//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.start
+						pstmtPick.setString(3, replOrder);	
+						pstmtPick.setInt(4, replOrderLineNo);
+						pstmtPick.setString(5, replOrder);	
+						pstmtPick.setInt(6, replOrderLineNo);
+					}
+					else
+					{
 						//changed by manish on 18/09/15 for Ms sql server database
 						if("mssql".equalsIgnoreCase(DB))
 						{
@@ -734,6 +785,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 						pstmtPick.setString(7, replOrder);	
 						pstmtPick.setInt(8, replOrderLineNo);
 						//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
+					}
+					//Changed by wasim on 06-11-2015 for DDUK project [END]	
 					rsPick = pstmtPick.executeQuery();
 
 					//Changed by sumit on 08/02/13 change to while
@@ -1955,8 +2008,12 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 
 
 			pstmt = con.prepareStatement(sql);
-			if(lotNo != null && lotNo.length() > 0)
+			//Changed by wasim on 06-11-2015 to trim the lotno [START]
+			//if(lotNo != null && lotNo.length() > 0)
+			//{
+			if(lotNo != null && (lotNo.trim()).length() > 0)
 			{
+			//Changed by wasim on 06-11-2015 to trim the lotno [END]
 				pstmt.setString(1, lotNo);
 				pstmt.setString(2, lotNo);
 			}

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

@@ -13,6 +13,7 @@ import java.sql.*;
 import java.util.TreeMap;
 
 import javax.ejb.Stateless; 
+
 import org.w3c.dom.*;
 
 import ibase.webitm.ejb.dis.DistCommon;
@@ -21,6 +22,9 @@ import ibase.webitm.ejb.wms.ReplIssConf;
 @Stateless 
 public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIssPosLocal
 {
+	String projectName = ""; //Changed by wasim on 06-11-15 for DDUK project
+	DistCommon distComm = new DistCommon();
+	
 	public String postSave( String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
 	{
 		System.out.println("--->postSave called xml str["+domString+"]");
@@ -55,6 +59,8 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 		boolean isConn= false;
 		try
 		{
+			projectName = checkNull(distComm.getDisparams("999999","PROJECT",conn));//Changed by wasim on 06-11-15 for DDUK project
+
 			dom = genericUtility.parseString(domString);
 			System.out.println("$$DOM@@--------->>["+genericUtility.serializeDom(dom)+"]");
 			
@@ -516,6 +522,20 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 				lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl", dom.getElementsByTagName("Detail3").item(row));
 				locCodeSys = GenericUtility.getInstance().getColumnValueFromNode("loc_code__sys", dom.getElementsByTagName("Detail3").item(row));
 				lotSlNew = GenericUtility.getInstance().getColumnValueFromNode("lot_sl__new", dom.getElementsByTagName("Detail3").item(row));
+				noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
+				
+				//changed by wasim on 22-06-2015 to set lotSlNew as lot_sl if it is blank [START]
+				if("DDUK".equalsIgnoreCase(projectName))
+				{	
+					System.out.println("lotSlNew is="+lotSlNew);
+					if(lotSlNew == null || lotSlNew.length() > 0)
+					{
+						System.out.println("Setting lotSlNew as LOT_SL");
+						lotSlNew = lotSl;
+					}
+				}
+				else
+				{
 					//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
 					//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
 					String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
@@ -528,6 +548,8 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 						noArt = 1;
 					}
 					//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
+				}
+				//changed by wasim on 22-06-2015 to set lotSlNew as lot_sl if it is blank [END]
 				
 				System.out.println(" replOrder ["+replOrder+"] lineNoOrd ["+lineNoOrd+"]");
 				System.out.println(" itemCode ["+itemCode+"] siteCode ["+siteCode+"] locCode["+locCode+"] lotNo["+lotNo+"] lotSl["+lotSl+"]");
@@ -596,9 +618,18 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 								  " AND ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND TRAN_ID = ?";
 							pstmt2 = conn.prepareStatement(sql);							
 							pstmt2.setDouble(1, quantity);
+							//Changed by wasim on 06-11-15 for DDUK project [START]
+							if("DDUK".equalsIgnoreCase(projectName))
+							{
+								pstmt2.setInt(2, 1);
+							}
+							else
+							{
 								//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
 								pstmt2.setDouble(2, rs.getInt("NO_ART"));
 								//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
+							}
+							//Changed by wasim on 06-11-15 for DDUK project [END]
 							pstmt2.setString(3, replOrder);
 							pstmt2.setInt(4, rs.getInt("LINE_NO"));
 							pstmt2.setString(5, itemCode);
@@ -642,10 +673,19 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 						pstmt2.setString(8, lotNo);
 						pstmt2.setString(9, lotSl);					
 						pstmt2.setDouble(10, quantity);
+						//Changed by wasim on 06-11-15 for DDUK project [START]
+						if("DDUK".equalsIgnoreCase(projectName))
+						{
+							pstmt2.setInt(11, 1);
+						}
+						else
+						{
 							//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
 							pstmt2.setInt(11, rs.getInt("NO_ART"));
 							//pstmt2.setDouble(11, 1);
 							//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
+						}
+						//Changed by wasim on 06-11-15 for DDUK project [End]
 						pstmt2.setString(12, locCodeSys);
 						pstmt2.setString(13, lotSlNew);
 						update = 0;
@@ -682,6 +722,10 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 				lotNo = GenericUtility.getInstance().getColumnValueFromNode("lot_no", dom.getElementsByTagName("Detail4").item(row));
 				lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl", dom.getElementsByTagName("Detail4").item(row));
 				locCodeTo = GenericUtility.getInstance().getColumnValueFromNode("loc_code__to", dom.getElementsByTagName("Detail4").item(row));
+				
+				//Changed by wasim on 06-11-15 for DDUK project [START]
+				if(!"DDUK".equalsIgnoreCase(projectName))
+				{
 					//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
 					//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
 					String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
@@ -694,6 +738,9 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
 						noArt = 1;
 					}
 					//Changes by Dadaso pawar on 27/03/15 as per Pragyan [End]
+				}
+				//Changed by wasim on 06-11-15 for DDUK project [END]
+				
 				lotSlNew = GenericUtility.getInstance().getColumnValueFromNode("lot_sl__new", dom.getElementsByTagName("Detail3").item(row));
 							
 				System.out.println(" replOrder ["+replOrder+"] ");