CHNAGES FOR NEW POINT BASE SCHEME

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

webitm-dis/ibase/webitm/ejb/dis/GroupSchemeIC.java

@@ -231,14 +231,14 @@ public class GroupSchemeIC extends ValidatorEJB implements GroupSchemeICLocal,Gr
 						if(childNodeName.equalsIgnoreCase("purc_base"))
 						{ 
 							
-							
+							schemeType=checkNull(this.genericUtility.getColumnValue("scheme_type", dom));
 							purchaseBaser = genericUtility.getColumnValue("purc_base", dom);
 							
 							if (purchaseBaser!=null )
 							{
 								purc_base= Double.parseDouble(purchaseBaser);
 							}
-							if( purchaseBaser == null || purc_base <= 0)	
+							if( (purchaseBaser == null || purc_base <= 0) && !"3".equalsIgnoreCase(schemeType))	
 							{
 								errCode = "UVGPSCHPB";
 								errList.add(errCode);
@@ -251,13 +251,14 @@ public class GroupSchemeIC extends ValidatorEJB implements GroupSchemeICLocal,Gr
 						
 						if(childNodeName.equalsIgnoreCase("sch_allowence"))
 						{    
+							schemeType=checkNull(this.genericUtility.getColumnValue("scheme_type", dom));
 							schemeAllowence = genericUtility.getColumnValue("sch_allowence", dom);
 							
 							if (schemeAllowence !=null )
 							{
 								sch_allowence= Double.parseDouble(schemeAllowence);
 							}
-							if( schemeAllowence == null || sch_allowence <= 0)	
+							if( (schemeAllowence == null || sch_allowence <= 0) && !"3".equalsIgnoreCase(schemeType))	
 							{
 								errCode = "UVGPSCHSA";
 								errList.add(errCode);

webitm-dis/ibase/webitm/ejb/dis/PostOrdDespatchGen.java

@@ -195,7 +195,7 @@ public class PostOrdDespatchGen
 					+ "SORDDET.CONV__RTUOM_STDUOM,SORDDET.UNIT__STD,SORDDET.QUANTITY__STDUOM,SORDDET.RATE__STDUOM,SORDDET.RATE__STD,"
 					+ "SORDDET.NO_ART,SORDDET.ITEM_CODE,SORDDET.ITEM_SER, SORDER.ORDER_TYPE,SORDDET.LINE_NO,"
 					+ "SORDER.TRANS_MODE,SORDER.REMARKS,SORDER.EXCH_RATE, SORDER.EXCH_RATE__FRT,SORDER.CURR_CODE__FRT,"
-					+ "SORDER.EXCH_RATE__INS,SORDER.CURR_CODE__INS,SORDER.FRT_AMT,SORDER.INS_AMT  "
+					+ "SORDER.EXCH_RATE__INS,SORDER.CURR_CODE__INS,SORDER.FRT_AMT,SORDER.INS_AMT,SORDDET.NATURE,SORDDET.ITEM_CODE__ORD  "// NATURE AND ITEM_CODE ORD COLUMN ADDED BY NANDKUMAR 03/06/19
 					+ "FROM SORDER,SORDDET "
 					+ "WHERE (   SORDER  .  SALE_ORDER   =   SORDDET  .  SALE_ORDER   ) "
 					+ "and  ( sorder.sale_order >= ? ) "
@@ -267,7 +267,14 @@ public class PostOrdDespatchGen
 				orderType = rs.getString("ORDER_TYPE");
 				lineNo = rs.getString("LINE_NO");
 				transMode = rs.getString("TRANS_MODE");
-				itemCode = rs.getString("item_code");
+				if("P".equalsIgnoreCase(rs.getString("NATURE")))
+				{
+				itemCode = rs.getString("ITEM_CODE__ORD");
+				}
+				else
+				{
+					itemCode = rs.getString("item_code");
+				}
 				remarks = rs.getString("remarks");
 				exchrate = rs.getDouble("EXCH_RATE");
 				currCodeFrt = rs.getString("CURR_CODE__FRT");

webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java

@@ -1318,9 +1318,20 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				pstmt1.setString(1,saleOrder);
 				pstmt1.setString(2,lineNo);
 				pstmt1.setString(3,siteCode);
-				pstmt1.setString(4,itemCode);
-				pstmt1.setString(5,itemCode);
-				pstmt1.setString(6,itemCode);
+				// CONDITON ADDED BY NANDKUMAR GADKARI ON 03/06/19
+				if("P".equalsIgnoreCase(nature))
+				{
+					pstmt1.setString(4,itemCodeOrd);
+					pstmt1.setString(5,itemCodeOrd);
+					pstmt1.setString(6,itemCodeOrd);
+				}
+				else {
+					pstmt1.setString(4,itemCode);
+					pstmt1.setString(5,itemCode);
+					pstmt1.setString(6,itemCode);
+				}
+				
+				
 				pstmt1.setString(7,itemFlg);
 				pstmt1.setString(8,itemFlg);
 				pstmt1.setString(9,unit);