scheme code not set , code compare with PB and and fix the bug related to Scheme

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

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

@@ -1938,6 +1938,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						itemSer=checkNull(genericUtility.getColumnValue("item_ser", dom1));
 						countCodeDlv=checkNull(genericUtility.getColumnValue("count_code__dlv", dom1));
 						custCodeDlv=checkNull(genericUtility.getColumnValue("cust_code__dlv", dom1));
+						stateCodeDlv = checkNull(genericUtility.getColumnValue("state_code__dlv", dom1));
 
 						sql = "select controlled_yn   from item where item_code =?";
 						pstmt = conn.prepareStatement(sql);
@@ -2171,9 +2172,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									{
 										appFrom = rs.getTimestamp("app_from");
 										validUpto = rs.getTimestamp("valid_upto");
-										applyCustList = rs.getString("apply_cust_list");
-										noapplyCustList = rs.getString("noapply_cust_list");
-										lsApplicableOrdTypes = rs.getString("order_type");
+										applyCustList = checkNull(rs.getString("apply_cust_list"));
+										noapplyCustList = checkNull(rs.getString("noapply_cust_list"));
+										lsApplicableOrdTypes = checkNull(rs.getString("order_type"));
 										if(dueDate.before(appFrom) || dueDate.after(validUpto))
 										{
 											errCode = "VTITEM8";
@@ -2194,7 +2195,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 
 
-									if("NE".equalsIgnoreCase(orderType) || (lsApplicableOrdTypes==null || lsApplicableOrdTypes.trim().length()==0))
+									if("NE".equalsIgnoreCase(orderType) && ((lsApplicableOrdTypes==null || lsApplicableOrdTypes.trim().length()==0)))
 									{
 										errCode = "VTITEM8";
 										errList.add(errCode);
@@ -2208,7 +2209,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										if(applicableOrdTypes.contains(orderType))
 										{
 											lbProceed=true;
-											break;
+//											break;
 										}
 										if(!lbProceed)
 										{
@@ -8253,7 +8254,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									if(applicableordtypesList.contains(lsOrderType))
 									{
 										lbProceed = true;
-										break;
+										//break;
 									}
 									if (!lbProceed)
 									{
@@ -8261,8 +8262,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										// goto Nextrec
 									}
 								}
-								//lsPrevscheme = lsSchemeCode;
-								//lsSchemeCode = lsCurscheme;
+								lsPrevscheme = lsSchemeCode;
+								lsSchemeCode = lsCurscheme;
 
 								if (lsApplyCustList.trim().length() > 0)
 								{
@@ -8273,7 +8274,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									{
 										lsSchemeCode = lsCurscheme;
 										lsCustSchemeCode = lsCurscheme;
-										break;
+										//break;
 									}
 								}
 								if (lsNoapplyCustList != null && lsNoapplyCustList.trim().length() > 0)
@@ -12331,7 +12332,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 		String lsCurscheme = "", lsItemCodeParent = "", lsApplyCustList = "", lsNoapplyCustList = "", lsApplicableOrdTypes = "", lsSchemeCode = "", lsPrevscheme = "";
 		String lsCustSchemeCode = "", lsItemStru = "", lsDisPobOrdTypeList = "", lsSchemeEdit = "", lsUnit = "", lsRefNo = "", lsSiteCodeShip = "", mSlabOn = "", lsDescr = "";
 		String lsSalesOrd = "", lsQuotNo = "",reStr="",ldtDateStr="";
-		int llNoOfArt = 0, cnt = 0, llPlcount = 0, llNoOfArt1 = 0, llNoOfArt2 = 0,pos=0;
+		int llNoOfArt = 0, cnt = 0, llPlcount = 0, llNoOfArt1 = 0, llNoOfArt2 = 0,pos=0,schecnt= 0;
 		Timestamp  ldPlistDate = null, mTranDate = null;
 		Timestamp mOrderDate=null,ldtPlDate=null;
 		boolean lsDiscFalg = false, lbProceed = false, lbOrdFlag = false;
@@ -12589,7 +12590,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						if(applicableOrdTypes.contains(lsOrderType))
 						{
 							lbProceed = true;
-							break;
+//							break;
 						}
 						if (!lbProceed)
 						{
@@ -12608,7 +12609,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						{
 							lsSchemeCode = lsCurscheme;
 							lsCustSchemeCode = lsCurscheme;
-							break;
+		//					break;
 						}
 					}
 					if (lsNoapplyCustList.trim().length() > 0 && lsSchemeCode != null)
@@ -12625,8 +12626,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					cnt = 0;
 					if (lsSchemeCode != null)
 					{
-						cnt++;
-					} else if (cnt > 0)
+						schecnt++;
+					} else if (schecnt == 1)
 					{
 						lsSchemeCode = lsPrevscheme;
 					}
@@ -12638,7 +12639,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				pstmt1.close();
 				pstmt1 = null;
 
-				if (cnt > 0)
+				if (schecnt > 1)
 				{
 					lsSchemeCode = "";
 				} else if (lsCustSchemeCode.trim().length() > 0)
@@ -12785,7 +12786,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				valueXmlString.append("<item_code protect = \"1\">").append("<![CDATA[" + lsSchemeCode + "]]>").append("</item_code>");
 				setNodeValue( dom, "item_code", getAbsString(lsSchemeCode));
 
-				if (cnt >= 1)
+				if (schecnt >= 1)
 				{
 					valueXmlString.append("<item_flg>").append("<![CDATA[" + 'B' + "]]>").append("</item_flg>");
 					setNodeValue( dom, "item_flg", getAbsString("B"));