Skip to content

B
business-java
Commit 4c8f3cb9 authored by prane's avatar prane
Browse files
Options

changes reverted 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214785 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a9194143
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 49 deletions
webitm-dis/src/ibase/webitm/ejb/dis/IndentConf.java
View file @ 4c8f3cb9
......@@ -23,9 +23,6 @@ import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
import java.sql.Timestamp;
import javax.ejb.Stateless;
......@@ -668,14 +665,7 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
String sql = "", sql1 = "", ls_errcode = "", ecode = "", ls_task_code = "", ls_item_code = "", ls_proj_code = "", ls_indtype = "",
ls_specific_instr = "", ls_act_code = "", ls_fl_id = "", ls_conf_unit = "", ls_ind_type = "", ls_type_allow_projbudgt_list = "",
ls_old_indno = "", currDate = "";
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
int cnt = 0;// lc_ind_qty = 0, lc_porder_qty = 0, lc_indent_qty = 0, lc_total_qty = 0, lc_proj_est_qty = 0;
double lc_ind_qty = 0, lc_porder_qty = 0, lc_indent_qty = 0, lc_total_qty = 0, lc_proj_est_qty = 0;
String siteCode = "";
Timestamp reqDate = null;
HashMap demandSupplyMap = null;
InvDemSuppTraceBean invDemSupTrcBean = null;
/**Modified by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
int cnt = 0, lc_ind_qty = 0, lc_porder_qty = 0, lc_indent_qty = 0, lc_total_qty = 0, lc_proj_est_qty = 0;
double mrate = 0.0, mmax_rate = 0.0, lc_tot_poamt = 0.0, lc_po_amt1 = 0.0, lc_porcp_amt = 0.0, lc_pret_amt = 0.0, lc_tot_poamt11 = 0.0,
lc_po_amt12 = 0.0, lc_porcp_amt11 = 0.0, lc_pret_amt11 = 0.0, lc_tot_amt_proj = 0.0, lc_tot_amt = 0.0, lc_ind_amount = 0.0,
lc_approxcost = 0.0, lc_exceed_amt = 0.0;
......@@ -703,11 +693,8 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
rs.close();
rs = null;
}
/**Modified by Pavan Rane 24dec19 start[to get qty in double instead of integer as to be update demand/supply in summary table(RunMRP process) related changes]*/
invDemSupTrcBean = new InvDemSuppTraceBean();
demandSupplyMap = new HashMap();
//sql = "SELECT TASK_CODE, ITEM_CODE, QUANTITY, PROJ_CODE, IND_TYPE, SPECIFIC_INSTR FROM INDENT WHERE IND_NO = ? AND STATUS = ? ";
sql = "SELECT TASK_CODE, ITEM_CODE, QUANTITY, PROJ_CODE, IND_TYPE, SPECIFIC_INSTR, SITE_CODE, REQ_DATE FROM INDENT WHERE IND_NO = ? AND STATUS = ? ";
sql = "SELECT TASK_CODE, ITEM_CODE, QUANTITY, PROJ_CODE, IND_TYPE, SPECIFIC_INSTR FROM INDENT WHERE IND_NO = ? AND STATUS = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setString(2, "U");
......@@ -716,15 +703,10 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
{
ls_task_code = checkNullAndTrim(rs.getString("TASK_CODE"));
ls_item_code = checkNullAndTrim(rs.getString("ITEM_CODE"));
//lc_ind_qty = rs.getInt("QUANTITY");
lc_ind_qty = rs.getDouble("QUANTITY");
lc_ind_qty = rs.getInt("QUANTITY");
ls_proj_code = checkNullAndTrim(rs.getString("PROJ_CODE"));
ls_indtype = checkNullAndTrim(rs.getString("IND_TYPE"));
ls_specific_instr = checkNullAndTrim(rs.getString("SPECIFIC_INSTR"));
siteCode = checkNullAndTrim(rs.getString("SITE_CODE"));
reqDate = rs.getTimestamp("REQ_DATE");
/**Modified by Pavan Rane 24dec19 end[to get qty in double instead of integer as to be update demand/supply in summary table(RunMRP process) related changes]*/
}
if(pstmt != null)
{
......@@ -748,9 +730,7 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
rs = pstmt.executeQuery();
if(rs.next())
{
//lc_porder_qty = rs.getInt(1);/**Modified by Pavan Rane 24dec19 [to get qty in double instead of integer as to be update demand/supply in summary table(RunMRP process) related changes]*/
lc_porder_qty = rs.getDouble(1);
lc_porder_qty = rs.getInt(1);
}
if(pstmt != null)
{
......@@ -771,8 +751,7 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
rs = pstmt.executeQuery();
if(rs.next())
{
//lc_indent_qty = rs.getInt(1);/**Modified by Pavan Rane 24dec19 start[to get qty in double instead of integer as to be update demand/supply in summary table(RunMRP process) related changes]*/
lc_indent_qty = rs.getDouble(1);
lc_indent_qty = rs.getInt(1);
}
if(pstmt != null)
{
......@@ -794,8 +773,7 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
rs = pstmt.executeQuery();
if(rs.next())
{
//lc_proj_est_qty = rs.getInt(1);/**Modified by Pavan Rane 24dec19 start[to get qty in double instead of integer as to be update demand/supply in summary table(RunMRP process) related changes]*/
lc_proj_est_qty = rs.getDouble(1);
lc_proj_est_qty = rs.getInt(1);
}
if(pstmt != null)
{
......@@ -1194,26 +1172,6 @@ public class IndentConf extends ActionHandlerEJB implements IndentConfLocal, Ind
if(cnt > 0)
{
/**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", ls_item_code);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", tranId);
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", lc_ind_qty);
demandSupplyMap.put("change_type", "A");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
ls_errcode = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
if(ls_errcode != null && ls_errcode.trim().length() > 0)
{
System.out.println("errString["+ls_errcode+"]");
return "VTDEMSUPER";
}
/**Added by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
String ediOption = "";
String dataStr = "";
sql = "SELECT EDI_OPTION FROM TRANSETUP WHERE TRAN_WINDOW = 'w_indent' ";
......
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