Skip to content

B
business-java
Commit 30185529 authored by dhirajchavan's avatar dhirajchavan
Browse files
Options

Added Code conn=getConnection(). 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102873 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b994d2f1
Show whitespace changes
Inline Side-by-side
Showing with 11579 additions and 11572 deletions
webitm-dis/ibase/webitm/ejb/dis/POrderAmdIC.java
View file @ 30185529
...@@ -91,7 +91,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -91,7 +91,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
FinCommon fincommon = new FinCommon(); FinCommon fincommon = new FinCommon();
DistCommon discommon = new DistCommon(); DistCommon discommon = new DistCommon();
Timestamp amdDate = null, dlvDate = null, reqDate = null, ordDate = null; Timestamp amdDate = null, dlvDate = null, reqDate = null, ordDate = null;
String siteCodeOrd = "", purcOrder = "", status = "", confirmed = "", modName = "", siteCodeDlv = "", siteCodeBill = "", suppCode = ""; String siteCodeOrd = "", purcOrder = "", status = "",amdStatus="", confirmed = "", modName = "", siteCodeDlv = "", siteCodeBill = "", suppCode = "";
String suppCodeO = "", deptCode = "", empCode = "", itemSer = "", crTerm = "", purcOrderHdr = ""; String suppCodeO = "", deptCode = "", empCode = "", itemSer = "", crTerm = "", purcOrderHdr = "";
String currCode = "", suppCurrCode = "", baseCurrCode = "", exchRate = "", amdDateStr = ""; String currCode = "", suppCurrCode = "", baseCurrCode = "", exchRate = "", amdDateStr = "";
String taxEnv = "", taxEnvpt = "", taxChap = "", taxChappt = "", taxClass = "", taxClasspt = "", projCode = "", quotNo = "", salesPers = "", varValue = ""; String taxEnv = "", taxEnvpt = "", taxChap = "", taxChappt = "", taxClass = "", taxClasspt = "", projCode = "", quotNo = "", salesPers = "", varValue = "";
...@@ -162,10 +162,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -162,10 +162,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
try { try {
System.out.println("@@@@@@@@ wfvaldata called"); System.out.println("@@@@@@@@ wfvaldata called");
//Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
connDriver = null; connDriver = null;
userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode"); userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
if (objContext != null && objContext.trim().length() > 0) { if (objContext != null && objContext.trim().length() > 0) {
...@@ -664,7 +662,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -664,7 +662,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom)); purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom));
lineNoOrd = " " + lineNoOrd; lineNoOrd = " " + lineNoOrd;
lineNoOrd = lineNoOrd.substring(lineNoOrd.length() - 3,lineNoOrd.length()); lineNoOrd = lineNoOrd.substring(lineNoOrd.length() - 3,lineNoOrd.length());
amdStatus = checkNull(genericUtility.getColumnValue("status", dom));
sql = " select status,dlv_qty,quantity from porddet where purc_order = ? and line_no = ? "; sql = " select status,dlv_qty,quantity from porddet where purc_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
...@@ -676,7 +674,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -676,7 +674,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
status = rs.getString("status"); status = rs.getString("status");
dlvQuty=rs.getDouble("dlv_qty"); dlvQuty=rs.getDouble("dlv_qty");
qty=rs.getDouble("quantity"); qty=rs.getDouble("quantity");
} }
System.out.println("STATUS@@"+status);
System.out.println("amdStatus@@"+amdStatus);
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -685,9 +687,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -685,9 +687,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
if ("C".equalsIgnoreCase(status)) if ("C".equalsIgnoreCase(status))
{ {
//Condition used for allow close to open PO //Condition used for allow close to open PO
System.out.println("STATUS@@"+status);
if((qty-dlvQuty)>0) if((qty-dlvQuty)>0 && amdStatus.equals("O"))
{ {
System.out.println("status@(qty-dlvQuty)>0@"+status);
System.out.println("entered in@@::[(qty-dlvQuty)>0]::"); System.out.println("entered in@@::[(qty-dlvQuty)>0]::");
break; break;
...@@ -3572,10 +3575,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder ...@@ -3572,10 +3575,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
String sysDate = sdf.format(currentDate.getTime()); String sysDate = sdf.format(currentDate.getTime());
System.out.println("Now the date is :=> " + sysDate); System.out.println("Now the date is :=> " + sysDate);
//Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false); conn.setAutoCommit(false);
connDriver = null; connDriver = null;
......
webitm-dis/ibase/webitm/ejb/dis/POrderIC.java
View file @ 30185529
...@@ -156,11 +156,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -156,11 +156,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
"<?xml version=\"1.0\"?>\r\n<Root><Errors>"); "<?xml version=\"1.0\"?>\r\n<Root><Errors>");
try { try {
System.out.println("wfValData called"); System.out.println("wfValData called");
//Changes and Commented By Bhushan on 09-06-2016 :START //onn = connDriver.getConnectDB("DriverITM");
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
DistCommon distComm = new DistCommon(); DistCommon distComm = new DistCommon();
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
// userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode"); // userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
...@@ -699,7 +696,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -699,7 +696,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
"proj_code", dom)); "proj_code", dom));
if (projCode == null || projCode.trim().length() == 0) { if (projCode == null || projCode.trim().length() == 0) {
if (pordType.trim() == "P") { if ("P".equalsIgnoreCase(pordType.trim())) {
errcode = "VTPROVI"; errcode = "VTPROVI";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -725,7 +722,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -725,7 +722,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if ("P".equalsIgnoreCase(pordType.trim())) { } else if ("P".equalsIgnoreCase(pordType.trim())) {
if (indNo.trim() != projIndno.trim()) { if (! indNo.trim().equalsIgnoreCase(projIndno.trim()))
{
errcode = "VINDPJMM"; errcode = "VINDPJMM";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -1107,7 +1105,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -1107,7 +1105,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (itemSer != itemSeries) { if (! itemSer.equalsIgnoreCase(itemSeries))
{
errcode = "VTITEMSER"; errcode = "VTITEMSER";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -1564,7 +1563,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -1564,7 +1563,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (status == "0") { if ( "0".equalsIgnoreCase(status))
{
errcode = "VTINDENT5"; errcode = "VTINDENT5";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName errFields.add(childNodeName
...@@ -1693,7 +1693,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -1693,7 +1693,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
typeAllowProjbudgtList = distComm.getDisparams( typeAllowProjbudgtList = distComm.getDisparams(
"999999", "TYPE_ALLOW_PROJBUDGET", conn); "999999", "TYPE_ALLOW_PROJBUDGET", conn);
if (typeAllowProjbudgtList == "NULLFOUND") { if ("NULLFOUND".equalsIgnoreCase(typeAllowProjbudgtList) ) {
typeAllowProjbudgtList = ""; typeAllowProjbudgtList = "";
} }
...@@ -1845,7 +1845,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -1845,7 +1845,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
if (projCodeTemp if (projCodeTemp
.equalsIgnoreCase(projCode .equalsIgnoreCase(projCode
.trim()) .trim())
&& lineNoTemp != lineNo) { && !lineNoTemp.equalsIgnoreCase(lineNo))
{
mqtyBrow = checkNull( mqtyBrow = checkNull(
genericUtility genericUtility
.getColumnValue( .getColumnValue(
...@@ -1986,7 +1987,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -1986,7 +1987,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
projectTypeOpt = distComm.getDisparams( projectTypeOpt = distComm.getDisparams(
"999999", "PROJECT_TYPE_OPT", conn); "999999", "PROJECT_TYPE_OPT", conn);
if (projectTypeOpt == "NULLFOUND") { if ( "NULLFOUND".equalsIgnoreCase(projectTypeOpt )) {
projectTypeOpt = ""; projectTypeOpt = "";
} }
...@@ -2165,14 +2166,14 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2165,14 +2166,14 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (itemSer.trim() != mval3.trim() if ( ! itemSer.trim().equalsIgnoreCase(mval3.trim())
&& "N".equalsIgnoreCase(status && "N".equalsIgnoreCase(status
.toUpperCase())) { .toUpperCase())) {
errcode = "VTITEM2"; errcode = "VTITEM2";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (itemSer.trim() != mval3.trim() } else if ( ! itemSer.trim().equalsIgnoreCase(mval3.trim())
&& status.toUpperCase() == "G") { && "G".equalsIgnoreCase(status.toUpperCase() )) {
sql = "Select (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end) from " sql = "Select (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end) from "
+ "itemser where item_ser = ? "; + "itemser where item_ser = ? ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -2187,8 +2188,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2187,8 +2188,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (itemSerCrpolicy.trim() != itemSerCrpolicy if ( ! itemSerCrpolicy.trim().equalsIgnoreCase( itemSerCrpolicy
.trim()) { .trim())) {
// errcode = // errcode =
// "VTITEM2"+"Item Does Not Belong To Group" // "VTITEM2"+"Item Does Not Belong To Group"
// ; // ;
...@@ -2320,7 +2321,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2320,7 +2321,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errFields.add(childNodeName errFields.add(childNodeName
.toLowerCase()); .toLowerCase());
} }
} else if (mindOpt == "N") { } else if ( "N".equalsIgnoreCase(mindOpt) ) {
if (indNo.trim().length() > 0) { if (indNo.trim().length() > 0) {
errcode = "VTINDRQ"; errcode = "VTINDRQ";
errList.add(errcode); errList.add(errcode);
...@@ -2466,7 +2467,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2466,7 +2467,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// lsvalue = gf_getenv_dis('999999', // lsvalue = gf_getenv_dis('999999',
// 'RCP_UOM_VARIANCE') // 'RCP_UOM_VARIANCE')
if (varValue == "NULLFOUND") { if ( "NULLFOUND".equalsIgnoreCase(varValue )) {
errcode = "TUOMVARPARM"; errcode = "TUOMVARPARM";
// errcode = errcode + // errcode = errcode +
// "Variabe RCP_UOM_VARIANCE not defined under Distribution Environment Variables " // "Variabe RCP_UOM_VARIANCE not defined under Distribution Environment Variables "
...@@ -2484,7 +2485,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2484,7 +2485,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
if (unitRate.trim() == unit.trim()) { if (unitRate.trim().equalsIgnoreCase(unit.trim())) {
if (Math.abs(Double.parseDouble(qtyStr) if (Math.abs(Double.parseDouble(qtyStr)
* Double.parseDouble(rateStr) * Double.parseDouble(rateStr)
- Double.parseDouble(qtystdStr) - Double.parseDouble(qtystdStr)
...@@ -2676,7 +2677,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2676,7 +2677,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errcode = "VTUNIT1"; errcode = "VTUNIT1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (unit != unitStd) { } else if (!unit.equalsIgnoreCase( unitStd)) {
convQtyStduom = checkNull(genericUtility convQtyStduom = checkNull(genericUtility
.getColumnValue("conv__qty_stduom", dom)); .getColumnValue("conv__qty_stduom", dom));
System.out.println("@@@@@@ convQtyStduom[" System.out.println("@@@@@@ convQtyStduom["
...@@ -2766,7 +2767,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2766,7 +2767,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
typeAllowPorateList = distComm.getDisparams( typeAllowPorateList = distComm.getDisparams(
"999999", "TYPE_ALLOW_PURC_RATE", conn); "999999", "TYPE_ALLOW_PURC_RATE", conn);
if (typeAllowPorateList == "NULLFOUND") { if ("NULLFOUND".equalsIgnoreCase(typeAllowPorateList)) {
typeAllowPorateList = ""; typeAllowPorateList = "";
} }
/* /*
...@@ -2869,12 +2870,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2869,12 +2870,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
|| convQtyStduom.trim().length() == 0) { || convQtyStduom.trim().length() == 0) {
convQtyStduom = "0"; convQtyStduom = "0";
} }
if (unit.trim() == unitStd.trim() if (unit.trim().equalsIgnoreCase(unitStd.trim())
&& Integer.parseInt(convQtyStduom) != 1) { && Integer.parseInt(convQtyStduom) != 1) {
errcode = "VTUCON1"; errcode = "VTUCON1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (unit.trim() != unitStd.trim()) { } else if (!unit.trim().equalsIgnoreCase(unitStd.trim())) {
itemCode = checkNull(genericUtility.getColumnValue( itemCode = checkNull(genericUtility.getColumnValue(
"item_code", dom)); "item_code", dom));
// errcode = gf_check_conv_fact(ls_item_code, // errcode = gf_check_conv_fact(ls_item_code,
...@@ -2901,12 +2902,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2901,12 +2902,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
convRtuomStduom = "0"; convRtuomStduom = "0";
} }
if (unit.trim() == unitStd.trim() if (unit.trim().equalsIgnoreCase(unitStd.trim())
&& Integer.parseInt(convRtuomStduom) != 1) { && Integer.parseInt(convRtuomStduom) != 1) {
errcode = "VTUCON1"; errcode = "VTUCON1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (unit.trim() != unitStd.trim()) { } else if (!unit.trim().equalsIgnoreCase(unitStd.trim())) {
itemCode = checkNull(genericUtility.getColumnValue( itemCode = checkNull(genericUtility.getColumnValue(
"item_code", dom)); "item_code", dom));
// errcode = gf_check_conv_fact(ls_item_code, // errcode = gf_check_conv_fact(ls_item_code,
...@@ -2984,7 +2985,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -2984,7 +2985,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errcode = "VTWORD1"; errcode = "VTWORD1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (status == "C" || status == "X") { } else if (status.equalsIgnoreCase("C") || status.equalsIgnoreCase("X")) {
errcode = "VTWORDER2"; errcode = "VTWORDER2";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -3021,7 +3022,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3021,7 +3022,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
qtyStduom = checkNull(genericUtility.getColumnValue( qtyStduom = checkNull(genericUtility.getColumnValue(
"quantity__stduom", dom)); "quantity__stduom", dom));
if (qtyStduom == "-999999999") { if ( "-999999999".equalsIgnoreCase(qtyStduom) ) {
errcode = "VTPOQTY3"; errcode = "VTPOQTY3";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -3031,7 +3032,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3031,7 +3032,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
rateStduom = checkNull(genericUtility.getColumnValue( rateStduom = checkNull(genericUtility.getColumnValue(
"rate__stduom", dom)); "rate__stduom", dom));
if (rateStduom == "-999999999") { if ("-999999999".equalsIgnoreCase(rateStduom)) {
errcode = "VTPORATE"; errcode = "VTPORATE";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -3129,7 +3130,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3129,7 +3130,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// trim(gf_getfinparm('999999','INV_ACCT_PORCP')) // trim(gf_getfinparm('999999','INV_ACCT_PORCP'))
if (!"ERROR".equalsIgnoreCase(invAcctPorcp)) { if (!"ERROR".equalsIgnoreCase(invAcctPorcp)) {
if (invAcctPorcp == null if (invAcctPorcp == null
|| invAcctPorcp == "NULLFOUND" || "NULLFOUND".equalsIgnoreCase(invAcctPorcp )
|| invAcctPorcp.trim().length() == 0) { || invAcctPorcp.trim().length() == 0) {
invAcctPorcp = "N"; invAcctPorcp = "N";
} }
...@@ -3830,8 +3831,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3830,8 +3831,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// invAcctQc = // invAcctQc =
// finCommon.getFinparams("999999","INV_ACCT_QCORDER", // finCommon.getFinparams("999999","INV_ACCT_QCORDER",
// conn); // conn);
if (invAcctQc != "ERROR") { if ( !"ERROR".equalsIgnoreCase(invAcctQc))
if (invAcctQc == null || invAcctQc == "NULLFOUND" {
if (invAcctQc == null || "NULLFOUND".equalsIgnoreCase(invAcctQc)
|| invAcctQc.trim().length() == 0) { || invAcctQc.trim().length() == 0) {
invAcctQc = "N"; invAcctQc = "N";
} }
...@@ -3856,8 +3858,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3856,8 +3858,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
invAcctPorcp = finCommon.getFinparams("999999", invAcctPorcp = finCommon.getFinparams("999999",
"INV_ACCT_PORCP", conn); "INV_ACCT_PORCP", conn);
if (invAcctPorcp != "ERROR") { if ( !"ERROR".equalsIgnoreCase(invAcctPorcp)) {
if (invAcctPorcp == null || invAcctPorcp == "NULLFOUND" if (invAcctPorcp == null || "NULLFOUND".equalsIgnoreCase(invAcctPorcp)
|| invAcctPorcp.trim().length() == 0) { || invAcctPorcp.trim().length() == 0) {
invAcctPorcp = "N"; invAcctPorcp = "N";
} }
...@@ -3867,8 +3869,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3867,8 +3869,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// invAcctQc = // invAcctQc =
// finCommon.getFinparams("999999","INV_ACCT_QCORDER", // finCommon.getFinparams("999999","INV_ACCT_QCORDER",
// conn); // conn);
if (invAcctQc != "ERROR") { if ( ! "ERROR".equalsIgnoreCase(invAcctQc)) {
if (invAcctQc == null || invAcctQc == "NULLFOUND" if (invAcctQc == null || "NULLFOUND".equalsIgnoreCase(invAcctQc)
|| invAcctQc.trim().length() == 0) { || invAcctQc.trim().length() == 0) {
invAcctQc = "N"; invAcctQc = "N";
} }
...@@ -3934,12 +3936,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3934,12 +3936,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (eou == "Y") { if ( "Y".equalsIgnoreCase(eou)) {
if (dutyPaid.trim().length() == 0 || dutyPaid == null) { if (dutyPaid.trim().length() == 0 || dutyPaid == null) {
errcode = "VTDUTYBK"; errcode = "VTDUTYBK";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (dutyPaid == "N") { } else if ( "N".equalsIgnoreCase(dutyPaid)) {
itemCode = checkNull(genericUtility.getColumnValue( itemCode = checkNull(genericUtility.getColumnValue(
"item_code", dom)); "item_code", dom));
ordDate = checkNull(genericUtility.getColumnValue( ordDate = checkNull(genericUtility.getColumnValue(
...@@ -3970,7 +3972,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -3970,7 +3972,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
+ " 00:00:00.0"); + " 00:00:00.0");
} }
if (lopReqd == "Y") { if ( "Y".equalsIgnoreCase(lopReqd)) {
cnt=0; cnt=0;
sql = "Select count(1) From lop_hdr a, lop_det b Where a.lop_ref_no = b.lop_ref_no And" sql = "Select count(1) From lop_hdr a, lop_det b Where a.lop_ref_no = b.lop_ref_no And"
+ "a.site_code = :ls_site_code And a.confirmed = 'Y' And b.item_code = :ls_itemCode And b.item_status ='A' And" + "a.site_code = :ls_site_code And a.confirmed = 'Y' And b.item_code = :ls_itemCode And b.item_status ='A' And"
...@@ -4020,7 +4022,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4020,7 +4022,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (eou == "Y" && dutyPaid == "N") { if ( "Y".equalsIgnoreCase(eou) && "N".equalsIgnoreCase(dutyPaid)) {
if (formNo != null && formNo.trim().length() > 0) { if (formNo != null && formNo.trim().length() > 0) {
suppCode = checkNull(genericUtility.getColumnValue( suppCode = checkNull(genericUtility.getColumnValue(
"supp_code", dom)); "supp_code", dom));
...@@ -4065,8 +4067,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4065,8 +4067,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
if (purcOrderTemp.equalsIgnoreCase(purcOrder if (purcOrderTemp.equalsIgnoreCase(purcOrder
.trim()) .trim())
&& formNoTemp == formNo && formNoTemp.equalsIgnoreCase(formNo)
&& lineNoTemp != lineNo) { && !lineNoTemp.equalsIgnoreCase(lineNo)) {
qtyBrow = checkNull( qtyBrow = checkNull(
genericUtility.getColumnValue( genericUtility.getColumnValue(
"quantity", dom2)).trim(); "quantity", dom2)).trim();
...@@ -4134,7 +4136,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4134,7 +4136,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
errcode = "VTCT3FORM1"; errcode = "VTCT3FORM1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} else if (status != "O") { } else if ( ! "O".equalsIgnoreCase(status)) {
errcode = "VTCT3FORM2"; errcode = "VTCT3FORM2";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -4146,7 +4148,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4146,7 +4148,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
} }
} }
} else if (eou == "Y" && dutyPaid == "Y") { } else if ( "Y".equalsIgnoreCase(eou) && "Y".equalsIgnoreCase(dutyPaid)) {
if (formNo != null && formNo.trim().length() > 0) { if (formNo != null && formNo.trim().length() > 0) {
errcode = "VTCT3DUTY"; errcode = "VTCT3DUTY";
errList.add(errcode); errList.add(errcode);
...@@ -4181,14 +4183,14 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4181,14 +4183,14 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
indNo = checkNull(genericUtility.getColumnValue("ind_no", indNo = checkNull(genericUtility.getColumnValue("ind_no",
dom)); dom));
if (pordType == "WO") { if ("WO".equalsIgnoreCase(pordType)) {
quantityFc = checkNull(genericUtility.getColumnValue( quantityFc = checkNull(genericUtility.getColumnValue(
"quantity__fc", dom)); "quantity__fc", dom));
if (quantityFc == null) { if (quantityFc == null) {
quantityFc = "0"; quantityFc = "0";
} }
if (quantityFc == "0") { if ( "0".equalsIgnoreCase(quantityFc)) {
errcode = "VTFC1"; errcode = "VTFC1";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -4207,7 +4209,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -4207,7 +4209,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
genericUtility.getColumnValue("ind_no", genericUtility.getColumnValue("ind_no",
dom2)).trim(); dom2)).trim();
if (itemCodeTemp == itemCode && indNoTemp == indNo) { if (itemCodeTemp.equalsIgnoreCase(itemCode) && indNoTemp.equalsIgnoreCase(indNo)) {
quantityFcTemp = checkNull( quantityFcTemp = checkNull(
genericUtility.getColumnValue( genericUtility.getColumnValue(
"quantity__fc", dom2)).trim(); "quantity__fc", dom2)).trim();
...@@ -5057,7 +5059,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -5057,7 +5059,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
lsValue = DistCommon.getDisparams("999999", "UOM_ROUND", conn); lsValue = DistCommon.getDisparams("999999", "UOM_ROUND", conn);
if (lsValue == "NULLFOUND") { if ( "NULLFOUND".equalsIgnoreCase(lsValue)) {
errcode = "VTUOMVARPARM"; errcode = "VTUOMVARPARM";
// errcode = errcode + // errcode = errcode +
// "Variable UOM_ROUND not defined under Distribution Environment Variables"; // "Variable UOM_ROUND not defined under Distribution Environment Variables";
...@@ -5438,11 +5440,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -5438,11 +5440,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
try { try {
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
connDriver = null; connDriver = null;
DistCommon distComm = new DistCommon(); DistCommon distComm = new DistCommon();
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
...@@ -5672,6 +5671,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -5672,6 +5671,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
valueXmlString.append("<bank_code__pay protect = '1'>") valueXmlString.append("<bank_code__pay protect = '1'>")
.append("").append("</bank_code__pay>"); .append("").append("</bank_code__pay>");
valueXmlString.append("<status protect = '0'>").append("O").append("</status>");
cnt = 0; cnt = 0;
sql = "select count(1) as cnt from proj_est_milestone"; sql = "select count(1) as cnt from proj_est_milestone";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -5864,7 +5865,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -5864,7 +5865,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
if (payMode == null if (payMode == null
|| payMode.trim().length() == 0 || payMode.trim().length() == 0
|| (payMode != "E" && payMode != "N" && payMode != "G")) { || ( ! "E".equalsIgnoreCase(payMode) && !"N".equalsIgnoreCase(payMode) && ! "G".equalsIgnoreCase(payMode)))
{
valueXmlString.append("<bank_code__pay protect = '1'>") valueXmlString.append("<bank_code__pay protect = '1'>")
.append("").append("</bank_code__pay>"); .append("").append("</bank_code__pay>");
} }
...@@ -6456,7 +6458,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -6456,7 +6458,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
if (payMode != null if (payMode != null
&& payMode.trim().length() > 0 && payMode.trim().length() > 0
&& (payMode == "E" || payMode == "G" || payMode == "N")) { && ( "E".equalsIgnoreCase(payMode) || "G".equalsIgnoreCase(payMode) || "N".equalsIgnoreCase(payMode))) {
valueXmlString.append("<bank_code__pay protect = '0'>") valueXmlString.append("<bank_code__pay protect = '0'>")
.append("").append("</bank_code__pay>"); .append("").append("</bank_code__pay>");
} else { } else {
...@@ -6835,7 +6837,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -6835,7 +6837,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (currCodefrtBase.trim() != currCodefrt.trim()) { if ( ! currCodefrtBase.trim().equalsIgnoreCase(currCodefrt.trim())) {
valueXmlString.append("<exch_rate__sp protect='0'>") valueXmlString.append("<exch_rate__sp protect='0'>")
.append("").append("</exch_rate__sp>"); .append("").append("</exch_rate__sp>");
} else { } else {
...@@ -7168,11 +7170,11 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7168,11 +7170,11 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
totAmt = Double.parseDouble(mhdrtot); totAmt = Double.parseDouble(mhdrtot);
ordAmt = Double.parseDouble(mhdrord); ordAmt = Double.parseDouble(mhdrord);
advPercInt = Double.parseDouble(advPerc); advPercInt = Double.parseDouble(advPerc);
if (advType == "F") { if ( "F".equalsIgnoreCase(advType)) {
advance = totAmt; advance = totAmt;
valueXmlString.append("<advance>").append(advPercInt) valueXmlString.append("<advance>").append(advPercInt)
.append("</advance>"); .append("</advance>");
} else if (advType == "P") { } else if ( "P".equalsIgnoreCase(advType)) {
advance = (advPercInt / 100) * totAmt; advance = (advPercInt / 100) * totAmt;
valueXmlString.append("<advance>").append(advance) valueXmlString.append("<advance>").append(advance)
.append("</advance>"); .append("</advance>");
...@@ -7223,7 +7225,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7223,7 +7225,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
frtType = checkNull(genericUtility.getColumnValue( frtType = checkNull(genericUtility.getColumnValue(
"frt_type", dom)); "frt_type", dom));
if (frtType == "Q") { if ( "Q".equalsIgnoreCase(frtType)) {
frtRate = genericUtility frtRate = genericUtility
.getColumnValue("frt_rate", dom); .getColumnValue("frt_rate", dom);
...@@ -7396,7 +7398,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7396,7 +7398,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (eou == "Y") { if ( "Y".equalsIgnoreCase(eou)) {
valueXmlString.append("<duty_paid>").append("N") valueXmlString.append("<duty_paid>").append("N")
.append("</duty_paid>"); .append("</duty_paid>");
} else { } else {
...@@ -7427,13 +7429,13 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7427,13 +7429,13 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
valueXmlString.append("<conv__rtuom_stduom>").append(1) valueXmlString.append("<conv__rtuom_stduom>").append(1)
.append("</conv__rtuom_stduom>"); .append("</conv__rtuom_stduom>");
indNo = genericUtility.getColumnValue("ind_no", dom); indNo = genericUtility.getColumnValue("ind_no", dom1);
if (tranboqId != null && tranboqId.trim().length() > 0) { if (tranboqId != null && tranboqId.trim().length() > 0) {
// valueXmlString.append("<ind_no protect='0'>").append("").append("</ind_no>"); // valueXmlString.append("<ind_no protect='0'>").append("").append("</ind_no>");
} else { } else {
if (indNo != null && indNo.trim().length() > 0) { if (indNo != null && indNo.trim().length() > 0) {
valueXmlString.append("<ind_no>") valueXmlString.append("<ind_no protect = '1'>")
.append(getAbsString(indNo)) .append(getAbsString(indNo))
.append("</ind_no>"); .append("</ind_no>");
// valueXmlString.append("<ind_no protect='1'>").append("").append("</ind_no>"); // valueXmlString.append("<ind_no protect='1'>").append("").append("</ind_no>");
...@@ -7528,7 +7530,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7528,7 +7530,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (preAssignLot.trim() == "Y") { if ("Y".equalsIgnoreCase(preAssignLot.trim() )) {
// valueXmlString.append("<lot_no__passign protect='0'>").append(cctrCodeApAdv).append("</lot_no__passign>"); // valueXmlString.append("<lot_no__passign protect='0'>").append(cctrCodeApAdv).append("</lot_no__passign>");
valueXmlString.append("<lot_no__passign protect='0'>") valueXmlString.append("<lot_no__passign protect='0'>")
.append("").append("</lot_no__passign>"); .append("").append("</lot_no__passign>");
...@@ -7538,7 +7540,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7538,7 +7540,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
.append("").append("</lot_no__passign>"); .append("").append("</lot_no__passign>");
} }
if (preAssignExp.trim() == "Y") { if ("Y".equalsIgnoreCase(preAssignExp.trim() )) {
// valueXmlString.append("<exp_date__passign protect='0'>").append(cctrCodeApAdv).append("</exp_date__passign>"); // valueXmlString.append("<exp_date__passign protect='0'>").append(cctrCodeApAdv).append("</exp_date__passign>");
valueXmlString valueXmlString
.append("<exp_date__passign protect='0'>") .append("<exp_date__passign protect='0'>")
...@@ -7615,7 +7617,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7615,7 +7617,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (preAssignLot.trim() == "Y") { if ("Y".equalsIgnoreCase(preAssignLot.trim() )) {
// valueXmlString.append("<lot_no__passign protect='0'>").append(cctrCodeApAdv).append("</lot_no__passign>"); // valueXmlString.append("<lot_no__passign protect='0'>").append(cctrCodeApAdv).append("</lot_no__passign>");
valueXmlString.append("<lot_no__passign protect='0'>") valueXmlString.append("<lot_no__passign protect='0'>")
.append("").append("</lot_no__passign>"); .append("").append("</lot_no__passign>");
...@@ -7625,7 +7627,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -7625,7 +7627,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
.append("").append("</lot_no__passign>"); .append("").append("</lot_no__passign>");
} }
if (preAssignExp.trim() == "Y") { if ("Y".equalsIgnoreCase(preAssignExp.trim() )) {
// valueXmlString.append("<exp_date__passign protect='0'>").append(cctrCodeApAdv).append("</exp_date__passign>"); // valueXmlString.append("<exp_date__passign protect='0'>").append(cctrCodeApAdv).append("</exp_date__passign>");
valueXmlString valueXmlString
.append("<exp_date__passign protect='0'>") .append("<exp_date__passign protect='0'>")
...@@ -9823,8 +9825,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -9823,8 +9825,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
costctrAsloccode = checkNull(distComm.getDisparams( costctrAsloccode = checkNull(distComm.getDisparams(
"999999", "CCENTER_AS_LOCATION", conn)); "999999", "CCENTER_AS_LOCATION", conn));
if (costctrAsloccode != "NULLFOUND" if ( ! "NULLFOUND".equalsIgnoreCase(costctrAsloccode)
&& costctrAsloccode == "Y") { && "Y".equalsIgnoreCase(costctrAsloccode)) {
mcode = genericUtility.getColumnValue("item_code", dom); mcode = genericUtility.getColumnValue("item_code", dom);
sql = " select case when qc_reqd is null then 'N' else qc_reqd end from item where item_code = ?"; sql = " select case when qc_reqd is null then 'N' else qc_reqd end from item where item_code = ?";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -9838,7 +9840,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -9838,7 +9840,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (qcReqd == "Y") { if ( "Y".equalsIgnoreCase(qcReqd )) {
CctrLoccode = costctr.trim() + "Q"; CctrLoccode = costctr.trim() + "Q";
valueXmlString.append("<loc_code>") valueXmlString.append("<loc_code>")
.append(CctrLoccode).append("</loc_code>"); .append(CctrLoccode).append("</loc_code>");
...@@ -9867,7 +9869,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -9867,7 +9869,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
invAcctQcorder = "N"; invAcctQcorder = "N";
} }
if (invAcctPorcp == "Y" && invAcctQcorder == "Y") { if ( "Y".equalsIgnoreCase(invAcctPorcp ) && "Y".equalsIgnoreCase(invAcctQcorder)) {
} else { } else {
costctr = ""; costctr = "";
...@@ -9990,7 +9992,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -9990,7 +9992,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if (Value == "O" || Value == "B") { if ( "O".equalsIgnoreCase(Value) || "B".equalsIgnoreCase(Value))
{
// lc_qtystduom = gf_conv_qty_fact1(unit, mVal1, // lc_qtystduom = gf_conv_qty_fact1(unit, mVal1,
// itemCode, qty, lcConv,'Y') ; // itemCode, qty, lcConv,'Y') ;
qtystduomArr = distComm.convQtyFactor(unit, mVal1, qtystduomArr = distComm.convQtyFactor(unit, mVal1,
...@@ -10007,7 +10010,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10007,7 +10010,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
.append(df.format(mVal1)) .append(df.format(mVal1))
.append("</unit__std>"); .append("</unit__std>");
} else { } else {
if (Value == "O" || Value == "B") { if ( "O".equalsIgnoreCase(Value) || "B".equalsIgnoreCase(Value))
{
// lc_qtystduom = gf_conv_qty_fact1(unit, mVal1, // lc_qtystduom = gf_conv_qty_fact1(unit, mVal1,
// itemCode, qty, lcConv,'Y') ; // itemCode, qty, lcConv,'Y') ;
qtystduomArr = distComm.convQtyFactor(unit, mVal1, qtystduomArr = distComm.convQtyFactor(unit, mVal1,
...@@ -10079,7 +10083,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10079,7 +10083,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
convTemp = Double.parseDouble(lcConv); convTemp = Double.parseDouble(lcConv);
if (Value == "R" || Value == "B") { if ( "R".equalsIgnoreCase(Value) || "B".equalsIgnoreCase(Value))
{
// lc_ratestduom = gf_conv_qty_fact1(mVal1, // lc_ratestduom = gf_conv_qty_fact1(mVal1,
// mVal, itemCode, lc_rate, lc_conv,'Y') // mVal, itemCode, lc_rate, lc_conv,'Y')
ratestduomArr = distComm.convQtyFactor(mVal1, ratestduomArr = distComm.convQtyFactor(mVal1,
...@@ -10138,7 +10143,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10138,7 +10143,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
varValue = distComm.getDisparams("999999", varValue = distComm.getDisparams("999999",
"PO_ADJ_VARIANCE", conn); "PO_ADJ_VARIANCE", conn);
// gf_getenv_dis('999999', 'PO_ADJ_VARIANCE') // gf_getenv_dis('999999', 'PO_ADJ_VARIANCE')
if (varValue == "Y") { if ( "Y".equalsIgnoreCase(varValue)) {
unit = checkNull(genericUtility.getColumnValue("unit", unit = checkNull(genericUtility.getColumnValue("unit",
dom)); dom));
unitRate = checkNull(genericUtility.getColumnValue( unitRate = checkNull(genericUtility.getColumnValue(
...@@ -10167,7 +10172,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10167,7 +10172,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
* Double.parseDouble(ratestd); * Double.parseDouble(ratestd);
if ((amt - amtStd) > Double.parseDouble(Value) if ((amt - amtStd) > Double.parseDouble(Value)
&& unit.trim() != unitRate.trim()) { && ! unit.trim().equalsIgnoreCase(unitRate.trim())) {
qtystdlc = (amt / Double.parseDouble(ratestd)); qtystdlc = (amt / Double.parseDouble(ratestd));
lcConvlc = Double.parseDouble(qtystd) lcConvlc = Double.parseDouble(qtystd)
/ Double.parseDouble(qty); / Double.parseDouble(qty);
...@@ -10182,7 +10187,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10182,7 +10187,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
amtStd = Double.parseDouble(qtystd) amtStd = Double.parseDouble(qtystd)
* Double.parseDouble(ratestd); * Double.parseDouble(ratestd);
if ((amt - amtStd) > Double.parseDouble(Value) if ((amt - amtStd) > Double.parseDouble(Value)
&& unit.trim() != unitRate.trim()) { && ! unit.trim().equalsIgnoreCase(unitRate.trim())) {
ratestdlc = (amt / Double.parseDouble(qtystd)); ratestdlc = (amt / Double.parseDouble(qtystd));
lcConvlc = Double.parseDouble(ratestd) lcConvlc = Double.parseDouble(ratestd)
/ Double.parseDouble(rate); / Double.parseDouble(rate);
...@@ -10518,7 +10523,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10518,7 +10523,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
quantityFc = checkNull(genericUtility.getColumnValue( quantityFc = checkNull(genericUtility.getColumnValue(
"quantity__fc", dom)); "quantity__fc", dom));
if (portType == "WO") { if ("WO".equalsIgnoreCase(portType) ) {
indNo = genericUtility.getColumnValue("ind_no", dom) indNo = genericUtility.getColumnValue("ind_no", dom)
.trim(); .trim();
if (indNo == null || indNo.trim().length() == 0) { if (indNo == null || indNo.trim().length() == 0) {
...@@ -10680,7 +10685,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10680,7 +10685,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
projCode = checkNull(genericUtility.getColumnValue( projCode = checkNull(genericUtility.getColumnValue(
"proj_code", dom)); "proj_code", dom));
if (Value == "05") { if ( "05".equalsIgnoreCase(Value))
{
sql = "select FN_GET_TASK_DESC(?,?,?) from dual"; sql = "select FN_GET_TASK_DESC(?,?,?) from dual";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -10819,7 +10825,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10819,7 +10825,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
if (indNoTemp != null if (indNoTemp != null
&& indNoTemp.equalsIgnoreCase(indNo.trim()) && indNoTemp.equalsIgnoreCase(indNo.trim())
&& lineNoTemp != lineNo) { && ! lineNoTemp.equalsIgnoreCase(lineNo)) {
qtystdTemp = checkNull( qtystdTemp = checkNull(
genericUtility.getColumnValue( genericUtility.getColumnValue(
"quantity__stduom", dom)).trim(); "quantity__stduom", dom)).trim();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment