Skip to content

B
business-java
Commit 386d8850 authored by prane's avatar prane
Browse files
Options

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214781... 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214781 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 95a9fdea
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 124 deletions
webitm-dis/src/ibase/webitm/ejb/dis/POrderAmdConf.java
View file @ 386d8850
......@@ -8,7 +8,6 @@ import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
//import ibase.webitm.ejb.dis_exp.PurcOrderAmdTWFInvokeConfirm;
import ibase.webitm.ejb.sys.CreateRCPXML;
import org.w3c.dom.*;
......@@ -312,11 +311,7 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca
}
}
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]
[changed method signature to pass xtraParams to update login user and login terminal]*/
//errCode = ConfirmPordAmd(amdNo, conn);
errCode = ConfirmPordAmd(amdNo, xtraParams, conn);
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
errCode = ConfirmPordAmd(amdNo, conn);
if (errCode != null && errCode.trim().length() > 0)
{
......@@ -433,10 +428,9 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
return errCode;
}
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]
[changed method signature to pass xtraParams to update login user and login terminal]*/
//public String ConfirmPordAmd(String amdNo, Connection conn) throws RemoteException, ITMException
public String ConfirmPordAmd(String amdNo, String xtraParams, Connection conn) throws RemoteException, ITMException
public String ConfirmPordAmd(String amdNo, Connection conn) throws RemoteException, ITMException
{
PreparedStatement pstmt = null, pstmt1 = null, pstmt3 = null, pstmtSql = null, pstmt4 = null,pstmt2 = null,pstmt5 = null,pstmt6 = null, pstmt7 = null, pstmtmax = null, pstmtcount = null,pstmtupd = null;
PreparedStatement pstmtopen=null,pstmtrcp=null,pstmtret=null,pstmtold=null;
......@@ -499,11 +493,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
boolean ValueType = false, firstNull=true;
DistCommon discommon = new DistCommon();
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
String loginUsr = "", termId = "", itemCodeInd = "", siteCodeInd= "";
Timestamp reqDateInd = null;
double quantityOld = 0;
/**Modified by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
//GenericUtility genericUtility = GenericUtility.getInstance();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
String termCode = "", descr = "", printOpt = "";
......@@ -515,12 +505,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
String sysDateStr = sdf.format(currentDate.getTime());
System.out.println("Now the date is :=> " + sysDateStr);
sysDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
loginUsr = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
termId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
HashMap demandSupplyMap = new HashMap();
/**Modified by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
sql = " select purc_order,site_code__dlv,site_code__ord,site_code__bill,dept_code,emp_code,item_ser,tax_opt," + " cr_term,ord_amt,tax_amt,tot_amt,curr_code,exch_rate,tax_chap,tax_class,tax_env,remarks,tax_date," + " proj_code,sales_pers,comm_perc,comm_perc__on,curr_code__comm,quot_no,tran_code,frt_amt,curr_code__frt," + " frt_term,dlv_term,insurance_amt,curr_code__ins,emp_code__aprv,ref_date,amd_date,supp_code," + " FRT_TYPE, FRT_RATE,FRT_AMT__QTY, FRT_AMT__FIXED " + " from poamd_hdr where amd_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, amdNo);
......@@ -982,10 +967,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
}
if (indNo != null && indNo.trim().length() > 0)
{
/**Modified by Pavan Rane 24dec19 start[fetiching colums like eq_date, item_code, site_code to update with demand/supply in summary table(RunMRP process) related changes]*/
//sql = " select quantity__stduom,ord_qty from indent where ind_no = ? ";
sql = " select quantity__stduom,ord_qty, req_date, item_code, site_code from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetiching colums like eq_date, item_code, site_code to update with demand/supply in summary table(RunMRP process) related changes]*/
sql = " select quantity__stduom,ord_qty from indent where ind_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, indNo);
rs = pstmt.executeQuery();
......@@ -993,11 +975,6 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
{
indquantity = rs.getDouble("quantity__stduom");//Changed variable to indquantity from quantity for indent value by Priyanka Das
ordQty = rs.getDouble("ord_qty");
/**Modified by Pavan Rane 24dec19 start[fetiching colums like eq_date, item_code, site_code to update with demand/supply in summary table(RunMRP process) related changes]*/
reqDateInd = rs.getTimestamp("req_date");
itemCodeInd = rs.getString("item_code");
siteCodeInd = rs.getString("site_code");
/**Modified by Pavan Rane 24dec19 end[fetiching colums like eq_date, item_code, site_code to update with demand/supply in summary table(RunMRP process) related changes]*/
}
rs.close();
rs = null;
......@@ -1020,7 +997,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
pstmt = null;
totOrdQty = (ordQty - quantStduom) + quantityStduom;
System.out.println("totOrdQty["+totOrdQty+"] ordQty["+ordQty+"] quantStduom["+quantStduom+"] quantityStduom["+quantityStduom+"]");
if (indquantity > totOrdQty)//Changed variable to indquantity from quantity for indent value by Priyanka Das
{
sql = " update indent set status = 'O', status_date = ? , ord_qty = ?," + " unit__ord = ? where ind_no = ? ";
......@@ -1052,32 +1029,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
errCode = "VTINDUPD";
errCode = itmDBAccessLocal.getErrorString("", errCode, "","",conn);
return errCode;
}/**Added by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
else
{
//InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
//HashMap demandSupplyMap = new HashMap();
demandSupplyMap.put("site_code", siteCodeInd);
demandSupplyMap.put("item_code", itemCodeInd);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", indNo.trim());
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDateInd);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", (totOrdQty- ordQty) *(-1));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", loginUsr);
demandSupplyMap.put("chg_term", termId);
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString["+errString+"]");
return errString;
}
}
/**Added by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
}
System.out.println("@@@@@@ lineNoOrd indNo [" + indNo + "]:::lineNoOrd[" + lineNoOrd + "]");
......@@ -1085,10 +1037,8 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
if (lineNoOrd != null && lineNoOrd.trim().length() > 0)
{
System.out.println("@@@@@@ inside indNo [" + indNo + "]:::lineNoOrd[" + lineNoOrd + "]");
/**Modified by Pavan Rane 24dec19 start[fetching quantity__stduom to with update demand/supply in summary table(RunMRP process) related changes]*/
//sql3 = " select item_code from porddet where purc_order = ? and line_no = ? ";
sql3 = " select item_code, quantity__stduom from porddet where purc_order = ? and line_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetching quantity__stduom to with update demand/supply in summary table(RunMRP process) related changes]*/
sql3 = " select item_code from porddet where purc_order = ? and line_no = ? ";
pstmt3 = conn.prepareStatement(sql3);
pstmt3.setString(1, purcOrder);
pstmt3.setString(2, lineNoOrd);
......@@ -1096,7 +1046,6 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
if (rs3.next())
{
oldItem = rs3.getString("item_code");
quantityOld = rs3.getDouble("quantity__stduom");
{
System.out.println("@@@@@@@@@@oldItem[" + oldItem + "]::::itemCode[" + itemCode + "]");
......@@ -1172,27 +1121,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
errCode = itmDBAccessLocal.getErrorString("", errCode, "","",conn);
return errCode;
}
/**Added by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code",siteCode);
demandSupplyMap.put("item_code", oldItem);
demandSupplyMap.put("ref_ser", "P-ORD");
demandSupplyMap.put("ref_id", purcOrder);
demandSupplyMap.put("ref_line", lineNoOrd);
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", (quantityStduom - quantityOld));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", loginUsr);
demandSupplyMap.put("chg_term", termId);
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString["+errString+"]");
return errString;
}
/**Added by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
// modify for ORO on 15/12/14 by cpatil start
System.out.println("@@@@@@@@@@@- code for P-ORO-----");
......@@ -1616,27 +1545,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
cnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
/**Added by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code",siteCode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "P-ORD");
demandSupplyMap.put("ref_id", purcOrder);
demandSupplyMap.put("ref_line", lineNoOrd);
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", quantityStduom);
demandSupplyMap.put("change_type", "A");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", loginUsr);
demandSupplyMap.put("chg_term", termId);
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString["+errString+"]");
return errString;
}
/**Modified by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
/*
* sql =
* " insert into taxtran ( tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class,tax_chap,tax_base,tax_env,"
......@@ -1935,27 +1844,6 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
// if (cnt == 0)
if (cnt > 0) //Change condtion from if (cnt == 0) to if (cnt > 0) VALLABH KADAM 20/NOV/14
{
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code",siteCode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "P-ORD");
demandSupplyMap.put("ref_id", purcOrder);
demandSupplyMap.put("ref_line", lineNoPO);
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", quantityStduom);
demandSupplyMap.put("change_type", "A");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", loginUsr);
demandSupplyMap.put("chg_term", termId);
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString["+errString+"]");
return errString;
}
/**Modified by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
/*
* sql =
* " insert into taxtran ( tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class,tax_chap,tax_base,tax_env,"
......
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