Changed by Manish on 02/03/16 in case of DDUK.

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

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

@@ -21,6 +21,7 @@ import ibase.ejb.*;
 import ibase.system.config.*;
 //import ibase.utility.BaseLogger;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
@@ -30,6 +31,10 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 	/**
 	 * The method is defined without any parameter and returns blank string
 	 */
+	//Added By Manish on 02/03/16 for DDUK
+	DistCommon distCommon = new DistCommon();
+	String projectName = "";
+
 	public String wfValData() throws RemoteException,ITMException
 	{
 		return "";
@@ -718,6 +723,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;
+			projectName = distCommon.getDisparams("999999","PROJECT",conn);  //Added By Manish on 02/03/16 for DDUK
 			
 			if( objContext != null && objContext.trim().length() > 0 )
 			{
@@ -743,8 +749,22 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 					valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
 					valueXmlString.append( "<item_code__fr><![CDATA[" ).append( "00" ).append( "]]></item_code__fr>\r\n" );
 					valueXmlString.append( "<item_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_code__to>\r\n" );
+					
+					//Changed By Manish on 02/03/16 for DDUK [start]
+					/*valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
+					valueXmlString.append( "<lot_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></lot_no__to>\r\n" );
+					 */
+					if("DDUK".equals(projectName.trim()))
+					{
+						valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( " " ).append( "]]></lot_no__fr>\r\n" );
+						valueXmlString.append( "<lot_no__to><![CDATA[" ).append( " " ).append( "]]></lot_no__to>\r\n" );
+					}
+					//Changed By Manish on 02/03/16 for DDUK [end]
+					else
+					{
 						valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
 						valueXmlString.append( "<lot_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></lot_no__to>\r\n" );
+					}
 					valueXmlString.append( "<sale_order__fr><![CDATA[" ).append( "00" ).append( "]]></sale_order__fr>\r\n" );
 					valueXmlString.append( "<sale_order__to><![CDATA[" ).append( "ZZ" ).append( "]]></sale_order__to>\r\n" );
 					valueXmlString.append( "<carton_no__fr><![CDATA[" ).append( "00" ).append( "]]></carton_no__fr>\r\n" );

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

 /*
     Window Name : w_wavegen
-*/
+ */
 
 package ibase.webitm.ejb.wms;
 
@@ -66,6 +66,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();	
 	CommonConstants commonConstants = new CommonConstants();
 	DistCommon discommon = new DistCommon();
+	String projectName = ""; //Added By Manish on 02/03/16 for DDUK
 
 	public String process() throws RemoteException,ITMException
 	{
@@ -147,6 +148,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;	
+			projectName = discommon.getDisparams("999999","PROJECT",conn);  //Added By Manish on 02/03/16 for DDUK
 			//siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
 			/*ptcn = genericUtility.getColumnValue("ptcn",headerDom);
 			if ( ptcn == null || ptcn.trim().length() == 0 )
@@ -193,67 +195,113 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}  
+			System.out.println(" custCodeTo ["+custCodeTo+"]");
 			custCodeDlvFr = genericUtility.getColumnValue("cust_code__dlv_fr",headerDom);
 			if ( custCodeDlvFr == null || custCodeDlvFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" custCodeDlvFr ["+custCodeDlvFr+"]");
 			custCodeDlvTo = genericUtility.getColumnValue("cust_code__dlv_to",headerDom); 
 			if ( custCodeDlvTo == null || custCodeDlvTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}  
+			System.out.println(" custCodeDlvTo ["+custCodeDlvTo+"]");
 			itemSerFr = genericUtility.getColumnValue("item_ser__fr",headerDom);
 			if ( itemSerFr == null || itemSerFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemSerFr ["+itemSerFr+"]");
 			itemSerTo = genericUtility.getColumnValue("item_ser__to",headerDom);
 			if ( itemSerTo == null || itemSerTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemSerTo ["+itemSerTo+"]");
 			itemCodeFr = genericUtility.getColumnValue("item_code__fr",headerDom);
 			if ( itemCodeFr == null || itemCodeFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemCodeFr ["+itemCodeFr+"]");
 			itemCodeTo = genericUtility.getColumnValue("item_code__to",headerDom);
 			if ( itemCodeTo == null || itemCodeTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemCodeTo ["+itemCodeTo+"]");
+
+			/*lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
+			if ( lotNoFr == null || lotNoFr.trim().length() == 0 )
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println(" lotNoFr ["+lotNoFr+"]");
+			lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
+			if ( lotNoTo == null || lotNoTo.trim().length() == 0 )
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}*/
+			//Changed By Manish on 02/03/16 for DDUK [start]
+			if("DDUK".equals(projectName.trim()))
+			{
+				lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
+				if ( lotNoFr == null || lotNoFr.length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoFr ["+lotNoFr+"]");
+				lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
+				if ( lotNoTo == null || lotNoTo.length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoTo ["+lotNoTo+"]");
+			}
+			else
+			{
 				lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
 				if ( lotNoFr == null || lotNoFr.trim().length() == 0 )
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 					return errString;
 				}
+				System.out.println(" lotNoFr ["+lotNoFr+"]");
 				lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
 				if ( lotNoTo == null || lotNoTo.trim().length() == 0 )
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 					return errString;
 				}
+				System.out.println(" lotNoTo ["+lotNoTo+"]");
+			}
+			//Changed By Manish on 02/03/16 for DDUK [start]
 			cartonNoFr = genericUtility.getColumnValue("carton_no__fr",headerDom);
 			if ( cartonNoFr == null || cartonNoFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" cartonNoFr ["+cartonNoFr+"]");
 			cartonNoTo = genericUtility.getColumnValue("carton_no__to",headerDom);
 			if ( cartonNoTo == null || cartonNoTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
-			
+			System.out.println(" cartonNoTo ["+cartonNoTo+"]");
 
 			/*getDataSql = " SELECT CM.CARTON_NO, POD.SALE_ORDER, POD.LINE_NO__SORD, CM.PICK_ORDER, CM.LINE_NO__PICK, " +
 					" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, POH.PICK_TYPE , POD.QUANTITY " +
@@ -346,6 +394,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		//	" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
 
 			//changed by manish on 28/09/15 for Ms sql server databse 
+
 			String DB = commonConstants.DB_NAME;
 			if("!mssql".equalsIgnoreCase(DB))
 			{
@@ -1000,7 +1049,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				pstmt.setString(15, pickType);
 				if( pstmt.executeUpdate() > 0 )
 				{
-					conn.commit();          //Added by manish on 29/09/15
+					conn.commit();          
 					System.out.println(" insert in DEALLOC_ART_DET succesfully done ");
 				}
 				else

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

@@ -64,7 +64,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		String orderCheck = "N"; //Changed by wasim on 03-07-2015 
 		int taxAmt = 0, taxAmtMagento = 0; //Changed by wasim on 03-07-2015 
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); //Changed by wasim on 03-07-2015 
-		int count = 0;
+		int count = 0,sCtr = 0;
 		Document dom = null;
 		double quantityS = 0,totAmt = 0,netTotAmt = 0,absDiffAmt = 0;
 		GenericUtility genericUtility = null;
@@ -79,6 +79,8 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		String exchRate = "";
 		String finEntity = "";
 		String finCurrCode = "";
+		
+		
 		try
 		{
 
@@ -237,6 +239,30 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 				System.out.println("ErrSaleOrder------>>["+ErrSaleOrder+"]");
 				//headerValuesMap = getSorderHdrData(dom);
 				//System.out.println("After getSorderHdrData headerValuesMap------>>"+headerValuesMap); UNIT
+				
+				
+				//Changed By Manish 02/03/16 check sorder exist.start
+				sql = "SELECT COUNT(*) FROM sorder WHERE SALE_ORDER = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, ErrSaleOrder);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					sCtr = rs.getInt(1);
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				
+				if(sCtr > 0)
+				{
+					retString = "Sales Order Number : ( "+ErrSaleOrder + ") Exist !!!";
+					return retString;
+				}
+				//Changed By Manish 02/03/16 check sorder exist.end
+				
+				
 				System.out.println("xmlString Before save data------>>["+xmlString+"]");
 				retString=saveData(this.siteCodeG, xmlString, conn);
 				System.out.println("Before retString------>>["+retString+"]");
@@ -710,7 +736,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		PreparedStatement pstmt=null;
 		ResultSet rs = null;
 		int count = 0;
-		String sql="",loginCode = "",remoteHost = "",stateCodeDlv = "",stationCode = "";
+		String sql="",loginCode = "",remoteHost = "",stateCodeDlv = "",stationCode = "",cityDlv = "";
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
 		Calendar currentDate = Calendar.getInstance();
@@ -798,6 +824,14 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			System.out.println("CCTR_CODE__AR="+cctrCodeAr);
 			//Changed by wasim on to set data from finparm 12-08-2015 [END]
 			
+			//Changed by Manish on 02/03/16 to set dlv_city up to size [start]
+			cityDlv = checkNull(headerValesMap.get("dlv_city"));
+			if (cityDlv.length() > 20)
+			{
+				cityDlv = cityDlv.substring(0, 20);
+			}
+			//Changed by Manish on 02/03/16 to set dlv_city up to size [end]
+			                                                           
 			sql = "insert into customer ( cust_code,cust_type,cust_name,sh_name,group_code,addr1,addr2,addr3,city,state_code,"
 				+ "pin,count_code,stan_code, tele1,tele2,tele3,fax,cust_code__bil,credit_lmt,chq_name,"
 				+ "curr_code,acct_code__ar,cctr_code__ar,tax_chap,cr_term,tran_code,sales_pers,channel_partner,site_code,dis_link,"
@@ -822,7 +856,8 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			pstmt.setString(6, headerValesMap.get("dlv_add1"));//addr1
 			pstmt.setString(7, headerValesMap.get("dlv_add2"));//addr2
 			pstmt.setString(8, headerValesMap.get("dlv_add2"));//addr3
-			pstmt.setString(9, headerValesMap.get("dlv_city"));//city
+		//	pstmt.setString(9, headerValesMap.get("dlv_city"));//city
+			pstmt.setString(9, cityDlv);//city
 
 			pstmt.setString(10, stateCodeDlv);//state_code