ItemSerIC.java

-Adding validation on acct_code__ap_adv and cctr_code__ap_adv column field.
POrderIC.java
-Called FinCommon.getAcctDetrTtype() method with new purpose "APADV",


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

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

@@ -64,6 +64,10 @@ public class ItemSerIC extends ValidatorEJB implements ItemSerICLocal, ItemSerIC
 				cctrCodeSal = "",cctrCodeFrt = "",cctrCodeDis = "",cctrCodeGsd = "",cctrCodeSret = "",
 				cctrCodeCiss = "",cctrCodeAdcost = "",cctrCodeOh = "",cctrCodeWp = "",cctrCodeCogs = "",
 				cctrCodeWpRcp = "",cctrCodeQcSample = "",cctrCodeYldLoss = "",cctrCodeYldGain = "";			
+		//Modified by Rohini T on[08/05/19][start]
+		String acctCodeApAdv = "";
+		String cctrCodeApAdv = "";
+		//Modified by Rohini T on[08/05/19][end]
 		ArrayList<String> errList = new ArrayList<String>();
 		ArrayList<String> errFields = new ArrayList<String>();
 		Connection conn = null;
@@ -677,6 +681,33 @@ public class ItemSerIC extends ValidatorEJB implements ItemSerICLocal, ItemSerIC
 						}							
 					}
 				}
+				//Modified by Rohini T on[08/05/19][start]
+				else if(childNodeName.equalsIgnoreCase("acct_code__ap_adv"))
+				{
+					acctCodeApAdv = checkNull(genericUtility.getColumnValue("acct_code__ap_adv", dom));	
+					System.out.println("acctCodeApAdv---->>["+acctCodeApAdv+"]");
+					if(acctCodeApAdv.length() > 0)
+					{
+						cnt=getDBRowCount(conn,"ACCOUNTS","ACCT_CODE",acctCodeApAdv);						
+						if(cnt == 0)
+						{
+							errCode = "VMACCT";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						else
+						{
+							active=getNameOrDescrForCode(conn, "ACCOUNTS", "ACTIVE", "ACCT_CODE", acctCodeApAdv);
+							if(!("Y".equalsIgnoreCase(active)))
+							{
+								errCode = "VMACCTA";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}							
+					}
+				}
+				//Modified by Rohini T on[08/05/19][end]
 				else if(childNodeName.equalsIgnoreCase("cctr_code__ap"))
 				{
 					cctrCodeAp = checkNull(genericUtility.getColumnValue("cctr_code__ap", dom));
@@ -956,6 +987,23 @@ public class ItemSerIC extends ValidatorEJB implements ItemSerICLocal, ItemSerIC
 						}						
 					}										
 				}
+				//Modified by Rohini T on[08/05/19][start]
+				else if(childNodeName.equalsIgnoreCase("cctr_code__ap_adv"))
+				{
+					cctrCodeApAdv = checkNull(genericUtility.getColumnValue("cctr_code__ap_adv", dom));
+					System.out.println("cctrCodeApAdv---->>["+cctrCodeApAdv+"]");
+					if(cctrCodeApAdv.length() > 0)
+					{
+						cnt=getDBRowCount(conn,"COSTCTR","CCTR_CODE",cctrCodeApAdv);						
+						if(cnt == 0)
+						{
+							errCode = "VMCCTR";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}						
+					}										
+				}
+				//Modified by Rohini T on[08/05/19][end]
 			}
 			int errListSize = errList.size();
 			cnt = 0;

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

@@ -5432,7 +5432,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 		String qtystd = "";
 		String Value = "";
 		String taskCodeDescr = "",convRtuomStduom = "";
-		
+		//Modified by Rohini T on[08/05/19][start]
+		String tranType = "";
+		//Modified by Rohini T on[08/05/19][end]
 		//Pavan R on 28aug18
 		String quantityStduomStr = "";
 		String  rateStduomStr = "";
@@ -7636,6 +7638,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 							"site_code__dlv", dom1));
 					valueXmlString.append("<site_code  protect='0'>")
 						.append("<![CDATA[" + siteCodeDlv + "]]>").append("</site_code>");
+					//Added by Rohini on 08-05-19 to set site code in detail dom [to fetch below for itemAcctDetrTtype acct_code__ap_adv]
+					setNodeValue( dom, "site_code", siteCodeDlv );
+					//Ended by Rohini on 08-05-19 to set site code in detail dom [to fetch below for itemAcctDetrTtype acct_code__ap_adv]
 					tranboqId = checkNull(genericUtility.getColumnValue(
 							"tran_id__boq", dom));
 
@@ -7753,6 +7758,35 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 					mval2 = checkNull(genericUtility.getColumnValue(
 							"supp_code", dom1));
 
+					//Modified by Rohini T on[08/05/19][start]
+					itemCode = checkNull(genericUtility.getColumnValue(
+							"item_code", dom));
+					System.out.println("itemCode::::::::"+itemCode);
+					itemSer = checkNull(genericUtility.getColumnValue(
+							"item_ser", dom1));
+					System.out.println("itemSer::::::::"+itemSer);
+					tranType = checkNull(genericUtility.getColumnValue(
+							"pord_type", dom1));
+					System.out.println("tranType::::::::"+tranType);
+					siteCode = checkNull(genericUtility.getColumnValue(
+							"site_code", dom));
+					System.out.println("siteCode::::::::"+siteCode);
+					cctrCodeApAdv = finCommon.getAcctDetrTtype(itemCode, itemSer, "APADV", tranType, siteCode, conn);
+
+					System.out.println("@@@@@@@ mcctr[" + cctrCodeApAdv + "]");
+					String mcctrArray[] = cctrCodeApAdv.split(",");
+					System.out.println("@@@@@ mcctrArray.length["
+							+ mcctrArray.length + "]");
+					if (mcctrArray.length > 0) {
+						acctCodeApAdv = mcctrArray[0];
+						cctrCodeApAdv = "";
+					}
+					if (mcctrArray.length > 1) {
+						acctCodeApAdv = mcctrArray[0];
+						cctrCodeApAdv = mcctrArray[1];
+					}
+					if(acctCodeApAdv == null || acctCodeApAdv.length() == 0) 
+					{
 					sql = " Select ACCT_CODE__AP_ADV,CCTR_CODE__AP_ADV From supplier Where supp_code = ?";
 					pStmt = conn.prepareStatement(sql);
 					pStmt.setString(1, mval2);
@@ -7767,6 +7801,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 					rs = null;
 					pStmt.close();
 					pStmt = null;
+					}
+					//Modified by Rohini T on[08/05/19][end]
 
 					// valueXmlString.append("<acct_code__ap_adv>").append(acctCodeApAdv).append("</acct_code__ap_adv>");
 					// valueXmlString.append("<cctr_code__ap_adv>").append(cctrCodeApAdv).append("</cctr_code__ap_adv>");