credit account set wrong in cas INV_ACCT_PORCP is set as S, system was expecting Y or N

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

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

@@ -130,7 +130,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 
 		String ordDate = "", siteCodeord = "", contractNo = "", pordType = "", bomCode = "", suppCode = "", siteCodeDlv = "", siteCodeBill = "", deptCode = "", siteCodeOrd = "", relieveDate = "", termTable = "", tranCode = "";
 		String itemSer = "", crTerm = "", currCode = "", msuppcurr = "", taxChap = "", taxClass = "", taxEnv = "", indNo = "", projCode = "", status = "", projIndno = "", quotNo = "", salesPers = "", dlvTerm = "", currCodefrt = "";
-		String frtAmt = "", insuranceAmt = "", currCodeins = "", saleOrder = "", conf = "", tranIdBoq = "", itemCode = "", qty = "", enqNo = "", proviTranid = "", itemSeries = "", mindOpt = "", acceptCriteria = "", policyNo = "", bankCodepay = "", payMode = "", active = "", locGroupjwiss = "", taskCode = "", termCode = "", relAmt = "", ordAmt = "", totAmt = "", lineNo = "", amtType = "", relAgnst = "", typeAllowProjbudgtBudgt = "", dueDate = "", taskCodeParent = "", lineNoPrev = "", siteCodeAdv = "", purcOrder = "", minDay = "", maxDay = "", refCode = "";
+		String frtAmt = "", insuranceAmt = "", invAcctSer = "",currCodeins = "", saleOrder = "", conf = "", tranIdBoq = "", itemCode = "", qty = "", enqNo = "", proviTranid = "", itemSeries = "", mindOpt = "", acceptCriteria = "", policyNo = "", bankCodepay = "", payMode = "", active = "", locGroupjwiss = "", taskCode = "", termCode = "", relAmt = "", ordAmt = "", totAmt = "", lineNo = "", amtType = "", relAgnst = "", typeAllowProjbudgtBudgt = "", dueDate = "";
+		String  taskCodeParent = "", lineNoPrev = "", siteCodeAdv = "", purcOrder = "", minDay = "", maxDay = "", refCode = "";
 		// String itemCode = "",
 		String siteCodeBillPo = "", exchRate = "", rate = "", qtyStduom = "", rateStduom = "", discount = "", typeAllowProjbudgtList = "", projType = "", projectTypeOpt = "", projectTypeOptList = "", taxAmt = "", stopBusi = "", cp = "", mval1 = "", mval3 = "", itemSerCrpolicy = "", quotOpt = "", analCode = "", acctCodeDr = "", quantityFc = "", qtystdStr = "", qtyStr = "", rateStr = "", ratestdStr = "", unitRate = "", unit = "", varValue = "", lsitemCode = "", unitStd = "", convRtuomStduom = "", priceList = "", itemCodels = "", typeAllowPorateList = "", typeAllowPorate = "", convQtyStduom = "", locCode = "", workOrder = "", packCode = "", acctCodeApadv = "", cctrCodeApadv = "", cctrCodeDr = "", cctrCodeCr = "", reqDate = "", dlvDate = "", invAcctPorcp = "", acctCodeCr = "", invAcctQc = "", projCodeTemp = "", lineNoTemp = "", disc = "", mqtyBrow = "", rateBrow = "", opReason = "", qcReqd = "", itemCodeMfg = "", empCodeQcaprv = "", specRef = "", specreqd = "", qcreqd = "", acctCodeProvDr = "", cctrCodeProvDr = "", acctCodeProvCr = "", cctrCodeProvCr = "", prdCodeRfc = "", eou = "", dutyPaid = "", formNo = "", lopReqd = "", purcOrderTemp = "", formNoTemp = "", qtyBrow = "", itemCodeTemp = "", indNoTemp = "", quantityFcTemp = "";
 
@@ -3947,25 +3948,19 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						}
 					}
 					if (childNodeName.equalsIgnoreCase("acct_code__prov_dr")) {
-						acctCodeProvDr = checkNull(genericUtility
-								.getColumnValue("acct_code__prov_dr", dom));
-						siteCode = checkNull(genericUtility.getColumnValue(
-								"site_code", dom));
+						acctCodeProvDr = checkNull(genericUtility.getColumnValue("acct_code__prov_dr", dom));
+						siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
 
-						invAcctPorcp = finCommon.getFinparams("999999",
-								"INV_ACCT_PORCP", conn);
+						invAcctPorcp = finCommon.getFinparams("999999", "INV_ACCT_PORCP", conn);
 
 						if (!"ERROR".equalsIgnoreCase(invAcctPorcp)) {
-							if (invAcctPorcp == null
-									|| "NULLFOUND"
-											.equalsIgnoreCase(invAcctPorcp)
+							if (invAcctPorcp == null || "NULLFOUND".equalsIgnoreCase(invAcctPorcp)
 									|| invAcctPorcp.trim().length() == 0) {
 								invAcctPorcp = "N";
 							}
 							// invAcctQc =
 							// trim(gf_getfinparm("999999","INV_ACCT_PORCP"));
-							invAcctQc = finCommon.getFinparams("999999",
-									"INV_ACCT_QCORDER", conn);
+							invAcctQc = finCommon.getFinparams("999999","INV_ACCT_QCORDER", conn);
 
 							if (!"ERROR".equalsIgnoreCase(invAcctQc)) {
 								if (invAcctQc == null
@@ -5727,7 +5722,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 		String ls_Cctr_Loccode = "";
 		double li_line_no = 0;
 		String ls_null = "";
-		String ls_line_no = "";
+		String ls_line_no = "",invAcctSer = "";
 
 		// cpatil end
 
@@ -10017,12 +10012,32 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						// trim(gf_getfinparm('999999','INV_ACCT_PORCP'))
 					ls_invacct = finCommon.getFinparams("999999",
 							"INV_ACCT_PORCP", conn);
-
 					if (ls_invacct == null
 							|| "NULLFOUND".equalsIgnoreCase(ls_invacct)
 							|| ls_invacct.trim().length() == 0) {
 						ls_invacct = "N";
 					}
+					// 14-nov-2019 manoharan in case INV_ACCT_PORCP  = 'S' then to consider the inv_acct of the itemser of the item
+					if ("S".equals(ls_invacct))
+					{
+						sql = " select inv_acct from itemser where item_ser = ?  ";
+						pStmt = conn.prepareStatement(sql);
+						pStmt.setString(1, ls_itemser);
+						rs = pStmt.executeQuery();
+						if (rs.next()) {
+							invAcctSer = checkNull(rs.getString("inv_acct"));
+						}
+						rs.close();
+						rs = null;
+						pStmt.close();
+						pStmt = null;
+						if(invAcctSer == null || invAcctSer.trim().length() == 0)
+						{
+							invAcctSer = "N";
+						}
+						ls_invacct = invAcctSer;
+					}
+					// end 14-nov-2019 manoharan in case INV_ACCT_PORCP  = 'S' then to consider the inv_acct of the itemser of the item
 
 					// ls_invacct_qc =
 					// trim(gf_getfinparm('999999','INV_ACCT_QCORDER'))
@@ -10035,6 +10050,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						ls_invacct_qc = "N";
 					}
 					// end if
+					
+					
 					if (ls_acct_cr == null || ls_acct_cr.trim().length() == 0) {
 						if ("Y".equalsIgnoreCase(ls_invacct)
 								&& !"Y".equalsIgnoreCase(ls_invacct_qc)) {
@@ -10735,11 +10752,35 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						// trim(gf_getfinparm('999999','INV_ACCT_PORCP'))
 						invAcctPorcp = finCommon.getFinparams("999999",
 								"INV_ACCT_PORCP", conn);
+						
 						if (invAcctPorcp == null
 								|| invAcctPorcp.equalsIgnoreCase("NULLFOUND")
 								|| invAcctPorcp.trim().length() == 0) {
 							invAcctPorcp = "N";
 						}
+						// 14-nov-2019 manoharan in case INV_ACCT_PORCP  = 'S' then to consider the inv_acct of the itemser of the item
+						if ("S".equals(invAcctPorcp))
+						{
+							sql = " select inv_acct from itemser where item_ser = (select item_ser from item where item_code ? ) ";
+							pStmt = conn.prepareStatement(sql);
+							pStmt.setString(1, mcode);
+							rs = pStmt.executeQuery();
+							if (rs.next()) {
+								invAcctSer = checkNull(rs.getString("inv_acct"));
+							}
+							rs.close();
+							rs = null;
+							pStmt.close();
+							pStmt = null;
+							if(invAcctSer == null || invAcctSer.trim().length() == 0)
+							{
+								invAcctSer = "N";
+							}
+							invAcctPorcp = invAcctSer;
+						}
+						// end 14-nov-2019 manoharan in case INV_ACCT_PORCP  = 'S' then to consider the inv_acct of the itemser of the item
+
+						
 						invAcctQcorder = finCommon.getFinparams("999999",
 								"INV_ACCT_QCORDER", conn);
 						if (invAcctQcorder == null