added cust code end field in insert statement

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

webitm-dis/src/ibase/webitm/ejb/dis/SaleOrderPostSave.java

@@ -283,6 +283,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 		int llPlcount=0,minShelfLife=0,lineNos=0,cnt=0;
 		String itemFlag="",lineNoSord="",chgUser="",chgTerm="",taxChap="",taxEnv="",taxClass="",unitRate="",itemDesc="",status="",unitStd="",packCode="",itemCode="";
 		String itemSer="",itemSerProm="",locType="",holdflag="",nature="",unitSal="",mType="";
+		String custCodeEnd="";   //added by manish mhatre on 08-nov-2019
 		boolean schemeUsedInDetail=false;
 		try {
 			chgUser = (genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));		
@@ -299,7 +300,21 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 			orderDateStr = genericUtility.getColumnValue("order_date", dom);
 			siteCode = (genericUtility.getColumnValue("site_code", dom));
 			
-			
+			//added by manish mhatre on 8-nov-2019
+			//start manish
+			sql="select cust_code__end from sorder where sale_order = ? ";
+			pstmt=conn.prepareStatement(sql);
+			pstmt.setString(1, tranId);
+			rs=pstmt.executeQuery();
+			if(rs.next())
+			{
+				custCodeEnd=checkNull((rs.getString(1)));
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt= null;
+			//end manish
 			
 			sql="select item_code__ord,ord_value,unit,quantity__stduom,ITEM_FLG,TAX_CLASS,TAX_CHAP,TAX_ENV,STATUS,ITEM_DESCR,UNIT__RATE,"
 					+ "CONV__QTY_STDUOM,CONV__RTUOM_STDUOM,UNIT__STD,PACK_CODE,ITEM_CODE,MIN_SHELF_LIFE,ITEM_SER,RATE__CLG,ITEM_SER__PROM,LOC_TYPE,HOLD_FLAG,"
@@ -592,12 +607,12 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 																+ "ITEM_CODE__ORD,OVER_SHIP_PERC,COMM_PERC_1,COMM_PERC_2,COMM_PERC_3,"//38
 																+ "SALES_PERS_COMM_1,SALES_PERS_COMM_2,SALES_PERS_COMM_3,RATE__STD,"//42
 																+ "LOC_TYPE,QUANTITY__FC,NATURE,"//45
-																+ "BILLBACK_AMT,OFFINV_AMT,HOLD_FLAG,NET_TOT_AMT,SCH_ATTR) " //50
+																+ "BILLBACK_AMT,OFFINV_AMT,HOLD_FLAG,NET_TOT_AMT,SCH_ATTR,CUST_CODE__END) " //50  //cust code end added by manish mhatre on 08-nov-2019
 																+ "values(?,?,?,?,?,?,?,?,?,?,"
 																+ "?,?,?,?,?,?,?,?,?,?,"
 																+"?,?,?,?,?,?,?,?,?,?,"
 																+"?,?,?,?,?,?,?,?,?,?,"
-																+"?,?,?,?,?,?,?,?,?,?)"; //50
+																+"?,?,?,?,?,?,?,?,?,?,?)"; //50
 														pstmt1 = conn.prepareStatement(sql);
 														pstmt1.setString(1, tranId);
 														lineNoSord = "   " + lineNoSord;
@@ -659,7 +674,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 														pstmt1.setString(48,holdflag);
 														pstmt1.setDouble(49,0);
 														pstmt1.setString(50,"N");	
-														
+														pstmt1.setString(51,custCodeEnd);  //added by manish mhatre on 08-nov-2019
 														
 														if(freeOrdvalue < freeValue)
 														{
@@ -750,6 +765,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 		String itemFlag="",lineNoSord="",chgUser="",chgTerm="",taxChap="",taxEnv="",taxClass="",unitRate="",itemDesc="",status="",unitStd="",packCode="",itemCode="";
 		String itemSer="",itemSerProm="",locType="",holdflag="",nature="",unitSal="",mType="";
 		String schemeCode="",countCodeDlv="",stateCodeDlv="",schemeCode1="",SordlineNo="",schemeStkChk="";
+		String custCodeEnd="";   //added by manish mhatre on 08-nov-2019
 		double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,availQty=0,unConfFreeQty=0,unconfreqPoints=0,unConfTotFreePoints=0,quantity=0;
 		boolean schemeUsedInDetail=false;
 		try {
@@ -771,7 +787,21 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 			priceList = (genericUtility.getColumnValue("price_list", dom));
 			
 			lsListType = distCommon.getPriceListType(priceList, conn);
-			
+			//added by manish mhatre on 8-nov-2019
+			//start manish
+			sql="select cust_code__end from sorder where sale_order = ? ";
+			pstmt=conn.prepareStatement(sql);
+			pstmt.setString(1, tranId);
+			rs=pstmt.executeQuery();
+			while(rs.next())
+			{
+				custCodeEnd=checkNull(rs.getString(1));
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt= null;
+			//end manish
 			sql="select item_code__ord,ord_value,unit,quantity__stduom,ITEM_FLG,TAX_CLASS,TAX_CHAP,TAX_ENV,STATUS,ITEM_DESCR,UNIT__RATE,"
 					+ "CONV__QTY_STDUOM,CONV__RTUOM_STDUOM,UNIT__STD,PACK_CODE,ITEM_CODE,MIN_SHELF_LIFE,ITEM_SER,RATE__CLG,ITEM_SER__PROM,LOC_TYPE,HOLD_FLAG,"
 					+ "NATURE,LINE_NO  " 
@@ -1182,12 +1212,12 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 														+ "ITEM_CODE__ORD,OVER_SHIP_PERC,COMM_PERC_1,COMM_PERC_2,COMM_PERC_3,"//38
 														+ "SALES_PERS_COMM_1,SALES_PERS_COMM_2,SALES_PERS_COMM_3,RATE__STD,"//42
 														+ "LOC_TYPE,QUANTITY__FC,NATURE,"//45
-														+ "BILLBACK_AMT,OFFINV_AMT,HOLD_FLAG,NET_TOT_AMT,SCH_ATTR) " //50
+														+ "BILLBACK_AMT,OFFINV_AMT,HOLD_FLAG,NET_TOT_AMT,SCH_ATTR,CUST_CODE__END) " //50   //cust_code__end added by manish mhatre on 08-nov-2019
 														+ "values(?,?,?,?,?,?,?,?,?,?,"
 														+ "?,?,?,?,?,?,?,?,?,?,"
 														+"?,?,?,?,?,?,?,?,?,?,"
 														+"?,?,?,?,?,?,?,?,?,?,"
-														+"?,?,?,?,?,?,?,?,?,?)"; //50
+														+"?,?,?,?,?,?,?,?,?,?,?)"; //50
 												pstmt1 = conn.prepareStatement(sql);
 												pstmt1.setString(1, tranId);
 												lineNoSord = "   " + lineNoSord;
@@ -1249,6 +1279,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 												pstmt1.setString(48,holdflag);
 												pstmt1.setDouble(49,0);
 												pstmt1.setString(50,"N");	
+												pstmt1.setString(51, custCodeEnd);      //added by manish mhatre on 08-nov-2019
 												
 												
 												
@@ -1649,6 +1680,17 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 			return Double.parseDouble(str);
 		}
 	}
+	//added by manish mhatre on 08-nov-2019
+	//start manish
+	private String checkNull(String input)
+	{
+		if (input == null || "null".equals(input))
+		{
+			input = "";
+		}
+		return input;
+	}
+	//end manish
 	private double integralPartQty(double value) {
 		double fractionalPart = value % 1;
 		double integralPart = value - fractionalPart;