Skip to content

B
business-java
Commit 89dfd76f authored by prane's avatar prane
Browse files
Options

to update demand and supply in inv_dem_supp table for mrp summary data by calling common component. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215358 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4acd74b9
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 59 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/DistOrderAmdConf.java
View file @ 89dfd76f
......@@ -4,6 +4,7 @@
package ibase.webitm.ejb.dis.adv;
import java.sql.*;
import java.text.SimpleDateFormat;
import java.rmi.RemoteException;
import javax.ejb.SessionContext;
import javax.ejb.CreateException;
......@@ -17,6 +18,9 @@ import ibase.webitm.ejb.ActionHandlerEJB;
import org.w3c.dom.Document;
import ibase.system.config.*;
import ibase.utility.CommonConstants;
import java.util.HashMap;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
import java.util.Properties;
import ibase.webitm.ejb.sys.GenerateEDI;
......@@ -45,7 +49,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
public String confirm(String tranId,String xtraParams, String forcedFlag) throws RemoteException,ITMException
{
Connection conn = null;
PreparedStatement pstmt = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null;
ResultSet rs1 = null;
String sql = "";
......@@ -58,6 +62,13 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
ITMDBAccessEJB itmDBAccessEJB = null;
String errString = null, ediOption = "0";
int upd = 0;
/**Added by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
Timestamp shipDate = null;
int leadTime = 0;
String siteCodeShip = "", siteCodeDlv = "";
SimpleDateFormat sdf1 = null;
Timestamp chgDate = null;
/**Added by Pavan Rane 24dec19 end[to update demand/supply in summary table(RunMRP process) related changes]*/
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -68,6 +79,10 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false);
sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
chgDate = java.sql.Timestamp.valueOf(sdf1.format(new java.util.Date()).toString() + " 00:00:00.0");
InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
HashMap demandSupplyMap = new HashMap();
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
//check if there is record in detail
int countDet = 0;
......@@ -214,12 +229,22 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
String netAmtDet = null ;
String taxAmtDet = null ;
String status = null; // added by ritesh on 20/dec/13 for DI3HSUP004
String siteCode = "";
Timestamp dueDate = null;
double qtyOrderOld = 0.0;
sql = " select hdr.dist_order, dtl.line_no_distord, dtl.qty_order, dtl.rate, "
+" dtl.rate__clg,dtl.remarks, dtl.pack_instr,dtl.cust_spec__no, "
+" dtl.tot_amt, dtl.net_amt,dtl.tax_amt, "
+" dtl.tax_class, dtl.tax_chap, dtl.tax_env "
+" ,dtl.status " // added by ritesh on 20/dec/13 FOR DI3HSUP004
/**Modified by Pavan Rane 24dec19 start[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
+", hdr.site_code, dtl.item_code, case when dtl.due_date is null then dtl.due_date_o else dtl.due_date end as due_date"
+", case when hdr.site_code__ship is null then hdr.site_code__ship_o else hdr.site_code__ship end as site_code__ship"
+", case when hdr.site_code__dlv is null then hdr.site_code__dlv_o else hdr.site_code__dlv end as site_code__dlv"
+", case when dtl.qty_order_o is null then 0 else dtl.qty_order_o end as qty_order_o "
/**Modified by Pavan Rane 24dec19 end[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
+" from distordamd hdr, distordamd_det dtl "
+" where hdr.amd_no = dtl.amd_no "
+" and hdr.amd_no = ?"
......@@ -254,7 +279,14 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
totAmtDet = rs.getString( "tot_amt" ) == null ? "" : rs.getString( "tot_amt" );
custSpecNo = rs.getString( "cust_spec__no" ) == null ? "" : rs.getString( "cust_spec__no" );
status = rs.getString( "status" ) == null ? "" : rs.getString( "status" ); // added by ritesh on 20/dec/13 FOR DI3HSUP004
/**Modified by Pavan Rane 24dec19 start[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
itemCode = rs.getString("item_code") == null ? "" : rs.getString("item_code");
siteCode = rs.getString("site_code") == null ? "" : rs.getString("site_code");
dueDate = rs.getTimestamp("due_date");
siteCodeShip = rs.getString("site_code__ship") == null ? "" : rs.getString("site_code__ship");
siteCodeDlv = rs.getString("site_code__dlv") == null ? "" : rs.getString("site_code__dlv");
qtyOrderOld = rs.getDouble("qty_order_o");
/**Modified by Pavan Rane 24dec19 end[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
sql = "update distorder_det set dist_order = ?, "
+" line_no = ?, "
+" qty_order = ?, "
......@@ -273,30 +305,75 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
+" ,status = ? " // added by ritesh on 20/dec/13 FOR DI3HSUP004
+" where dist_order = ? "
+" and line_no = ? " ;
pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrderamd.trim());
pstmt.setString(2,lineNoDistord.trim());
pstmt.setString(3,qtyOrder.trim());
pstmt.setString(4,rate.trim());
pstmt.setString(5,rateClg.trim());
pstmt.setString(6,remarks.trim());
pstmt.setString(7,packInstr.trim());
pstmt.setString(8,taxClass.trim());
pstmt.setString(9,taxChap.trim());
pstmt.setString(10,taxEnv);
pstmt.setString(11,netAmtDet.trim());
pstmt.setString(12,totAmtDet.trim());
pstmt.setString(13,taxAmtDet.trim());
pstmt.setString(14,custSpecNo.trim());
pstmt.setString(15,qtyOrder.trim());
pstmt.setString(16,status.trim()); // added by ritesh on 20/dec/13 FOR DI3HSUP004
pstmt.setString(17,distOrderamd.trim());
pstmt.setString(18,lineNoDistord.trim());
pstmt.executeUpdate();
/**Modified by Pavan Rane 24dec19 start[changed same perpared statement refenrece as pstmt to pstmt1 and closed ]*/
pstmt1 = conn.prepareStatement( sql );
pstmt1.setString(1,distOrderamd.trim());
pstmt1.setString(2,lineNoDistord.trim());
pstmt1.setString(3,qtyOrder.trim());
pstmt1.setString(4,rate.trim());
pstmt1.setString(5,rateClg.trim());
pstmt1.setString(6,remarks.trim());
pstmt1.setString(7,packInstr.trim());
pstmt1.setString(8,taxClass.trim());
pstmt1.setString(9,taxChap.trim());
pstmt1.setString(10,taxEnv);
pstmt1.setString(11,netAmtDet.trim());
pstmt1.setString(12,totAmtDet.trim());
pstmt1.setString(13,taxAmtDet.trim());
pstmt1.setString(14,custSpecNo.trim());
pstmt1.setString(15,qtyOrder.trim());
pstmt1.setString(16,status.trim()); // added by ritesh on 20/dec/13 FOR DI3HSUP004
pstmt1.setString(17,distOrderamd.trim());
pstmt1.setString(18,lineNoDistord.trim());
int updCnt = pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
/**Modified by Pavan Rane 24dec19 end[changed same perpared statement refenrece as pstmt to pstmt1 and closed ]*/
/**Added by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
if(updCnt > 0)
{
demandSupplyMap.put("site_code", siteCodeShip);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "D-ORDI");
demandSupplyMap.put("ref_id", distOrderamd);
demandSupplyMap.put("ref_line", lineNoDistord);
demandSupplyMap.put("due_date", dueDate);
demandSupplyMap.put("demand_qty", Double.parseDouble(qtyOrder)-qtyOrderOld);
demandSupplyMap.put("supply_qty", 0.0);
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
System.out.println("errString D-ORDI ["+errString+"]");
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString["+errString+"]");
return errString;
}
demandSupplyMap.put("site_code", siteCodeDlv);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "D-ORDR");
demandSupplyMap.put("ref_id", distOrderamd);
demandSupplyMap.put("ref_line", lineNoDistord);
demandSupplyMap.put("due_date", dueDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", Double.parseDouble(qtyOrder)-qtyOrderOld);
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
demandSupplyMap.clear();
System.out.println("errString D-ORD ["+errString+"]");
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]*/
}
rs.close();
rs = null;
......@@ -305,6 +382,11 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
sql = " select hdr.dist_order, dtl.line_no_distord, dtl.qty_order, dtl.rate, dtl.item_code , "
+" dtl.rate__clg,dtl.remarks, dtl.pack_instr, dtl.tax_class, dtl.tax_chap, dtl.tax_env "
/**Modified by Pavan Rane 24dec19 start[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
+", case when hdr.ship_date_o is null then (case when dtl.ship_date is null then dtl.due_date_o else dtl.ship_date end) else hdr.ship_date_o end as ship_date "
+ ", case when hdr.site_code__ship is null then hdr.site_code__ship_o else hdr.site_code__ship end as site_code__ship"
+ ", case when hdr.site_code__dlv is null then hdr.site_code__dlv_o else hdr.site_code__dlv end as site_code__dlv"
/**Modified by Pavan Rane 24dec19 end[fetched extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
+" from distordamd hdr, distordamd_det dtl "
+" where hdr.amd_no = dtl.amd_no "
+" and hdr.amd_no = ? "
......@@ -336,39 +418,117 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
taxChap = rs.getString( "tax_chap" ) == null ? "" : rs.getString( "tax_chap" );
//taxEnv = rs.getString( "tax_env" ) == null ? "" : rs.getString( "tax_env" );
taxEnv = rs.getString( "tax_env" );
/**Modified by Pavan Rane 24dec19 start[fetched extra columns to calculate due date and to update with demand/supply in summary table(RunMRP process) related changes]*/
shipDate = rs.getTimestamp("ship_date");
siteCodeShip = rs.getString("site_code__ship") == null ? "" : rs.getString("site_code__ship");
siteCodeDlv = rs.getString("site_code__dlv") == null ? "" : rs.getString("site_code__dlv");
leadTime = 0;
String sql2 = "select case when max(case when pur_lead_time is null then 0 else pur_lead_time end) is null then 0 "
+ " else max(case when pur_lead_time is null then 0 else pur_lead_time end) end "
+ " from siteitem where site_code = ? ";
pstmt1 = conn.prepareStatement(sql2);
pstmt1.setString(1, siteCodeDlv);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
leadTime = rs1.getInt(1);
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
UtilMethods util = new UtilMethods();
dueDate = util.RelativeDate(shipDate, leadTime);
/**Modified by Pavan Rane 24dec19 end[fetched extra columns to calculate due date and to update with demand/supply in summary table(RunMRP process) related changes]*/
sql = " select (max(line_no) + 1) line_no from distorder_det where dist_order = ? ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) || "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = sql + " for update ";
}System.out.println("executing Sql "+sql);
pstmt = conn.prepareStatement( sql );
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]
Changed the same preparedstatement used inside loop*/
/*pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim());
rs1 = pstmt.executeQuery();
rs1 = pstmt.executeQuery();*/
pstmt1 = conn.prepareStatement( sql );
pstmt1.setString(1,distOrder.trim());
rs1 = pstmt1.executeQuery();
String lineNo = null;
if ( rs1.next() )
{
lineNo = rs1.getString( "line_no" );
}
sql = "insert into distorder_det ( dist_order,line_no,item_code,qty_order,rate,rate_clg,remarks,pack_instr,tax_class,tax_chap,tax_env,qty_confirm ) "
+" values ( ?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim());
pstmt.setInt(2,Integer.parseInt(lineNo.trim()));
pstmt.setString(3,itemCode.trim());
pstmt.setString(4,qtyOrder.trim());
pstmt.setString(5,rate.trim());
pstmt.setString(6,rateClg.trim());
pstmt.setString(7,remarks.trim());
pstmt.setString(8,packInstr.trim());
pstmt.setString(9,taxClass.trim());
pstmt.setString(10,taxChap.trim());
pstmt.setString(11,taxEnv);
pstmt.setString(12,qtyOrder.trim());
pstmt.executeUpdate();
rs1.close();
rs1 = null;
rs1 = null;
pstmt1.close();
pstmt1 = null;
sql = "insert into distorder_det ( dist_order,line_no,item_code,qty_order,rate,rate_clg,remarks,pack_instr,tax_class,tax_chap,tax_env,qty_confirm, due_date ) "
+" values ( ?,?,?,?,?,?,?,?,?,?,?,?,?) ";
//Pavan Rane start [to add DEMAND/SUPPLY in INV_DEM_SUPP for MRP]pstmt changed to pstmt1
pstmt1 = conn.prepareStatement( sql );
pstmt1.setString(1,distOrder.trim());
pstmt1.setInt(2,Integer.parseInt(lineNo.trim()));
pstmt1.setString(3,itemCode.trim());
pstmt1.setString(4,qtyOrder.trim());
pstmt1.setString(5,rate.trim());
pstmt1.setString(6,rateClg.trim());
pstmt1.setString(7,remarks.trim());
pstmt1.setString(8,packInstr.trim());
pstmt1.setString(9,taxClass.trim());
pstmt1.setString(10,taxChap.trim());
pstmt1.setString(11,taxEnv);
pstmt1.setString(12,qtyOrder.trim());
pstmt1.setTimestamp(13,dueDate); //Pavan Rane [to add DEMAND/SUPPLY in INV_DEM_SUPP for MRP]
int updCnt = pstmt1.executeUpdate();
//rs1.close();
//rs1 = null;
pstmt1.close();
pstmt1 = null;
if(updCnt > 0)
{
demandSupplyMap.put("site_code", siteCodeShip);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "D-ORDI");
demandSupplyMap.put("ref_id", distOrder);
demandSupplyMap.put("ref_line", lineNo);
demandSupplyMap.put("due_date", chgDate);
demandSupplyMap.put("demand_qty", Double.parseDouble(qtyOrder));
demandSupplyMap.put("supply_qty", 0.0);
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"));
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
//demandSupplyMap.clear();
System.out.println("errString D-ORDI ["+errString+"]");
if(errString != null && errString.trim().length() > 0)
{
System.out.println("errString ["+errString+"]");
return errString;
}
demandSupplyMap.put("site_code", siteCodeShip);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "D-ORDR");
demandSupplyMap.put("ref_id", distOrder);
demandSupplyMap.put("ref_line", lineNo);
demandSupplyMap.put("due_date", dueDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", Double.parseDouble(qtyOrder));
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"));
errString = invDemSupTrcBean.updateDemandSupply(demandSupplyMap, conn);
//demandSupplyMap.clear();
System.out.println("errString D-ORDR ["+errString+"]");
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]*/
}
rs.close();
rs = null;
......
webitm-dis/src/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 89dfd76f
......@@ -11,6 +11,7 @@ import ibase.utility.CommonConstants;
import ibase.webitm.utility.*;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.mfg.ExplodeBom;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
import ibase.webitm.ejb.mfg.adv.RcpBackflushConfirm;
import ibase.webitm.ejb.sys.*;
import ibase.system.config.*;
......@@ -1385,6 +1386,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
InvAllocTraceBean invAllocTrace = null;
HashMap strAllocate = null;
//Manish Mhatre 16oct19 end [to de-allocate free qty customer stock]
Timestamp dlvDate = null;
try
{
//Manish Mhatre 16oct19 start [to de-allocate free qty customer stock]
......@@ -1393,7 +1395,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
HashMap<String, String> sordAllocStk = null;
//Manish Mhatre 16oct19 end [to de-allocate free qty customer stock]
DistCommon distCommon = new DistCommon();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
HashMap demandSupplyMap = new HashMap();
//sql = "Select tran_date, site_code,tran_ser,supp_code,post_type , curr_code , exch_rate, channel_partner From porcp Where tran_id = ? ";
sql = "Select tran_date, site_code,tran_ser,supp_code,post_type , curr_code , exch_rate, channel_partner From porcp Where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -1861,7 +1865,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// /////////////////////////////////////////////////////////////////////////////
if (purcOrder != null)
{
sql = "select quantity, dlv_qty, status, site_code " + " from porddet " + " Where Purc_order = ? And line_no = ?";
sql = "select quantity, dlv_qty, status, site_code, dlv_date " + " from porddet " + " Where Purc_order = ? And line_no = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, purcOrder);
pstmt1.setString(2, pordLine);
......@@ -1872,6 +1876,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
dlvQuantity = rs1.getDouble("dlv_qty");
ordStatus = rs1.getString("status");
siteCodeDet = rs1.getString("site_code");
/**Modified by Pavan Rane 24dec19 [fetching dlv_date to update demand/supply in summary table(RunMRP process) related changes]*/
dlvDate = rs1.getTimestamp("dlv_date");
}
pstmt1.close();
pstmt1 = null;
......@@ -2545,6 +2551,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
}
pstmtUpd.close();
pstmtUpd = null;
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code", siteCodeDet);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "P-ORD");
demandSupplyMap.put("ref_id", purcOrder);
demandSupplyMap.put("ref_line", pordLine);
demandSupplyMap.put("due_date",dlvDate );
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", quantity *(-1));//quantity_stuom - dlv_qty
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"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]*/
}
// Changed By Pragyan on 25/02/15 to fix bug as suggested by
// Manohran sir
......
webitm-dis/src/ibase/webitm/ejb/dis/adv/PorderClosePrc.java
View file @ 89dfd76f
......@@ -1472,7 +1472,11 @@ public class PorderClosePrc extends ProcessEJB implements PorderClosePrcLocal,
//Calling confirm function of purchase order confirm
String forcedFlag = "";
errString = Conf.ConfirmPordAmd(tranIdPe, conn);//(tranIdPe, xtraParams, forcedFlag);
/**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]*/
//errString = Conf.ConfirmPordAmd(tranIdPe, conn);//(tranIdPe, xtraParams, forcedFlag);
errString = Conf.ConfirmPordAmd(tranIdPe, xtraParams,conn);//(tranIdPe, xtraParams, forcedFlag);
/**Modified by Pavan Rane 24dec19 end[changed the mtheod signature in POrderAmdConf component]*/
System.out.println("errString@conf@"+errString);
if(errString==null||errString.trim().length()==0 || errString.indexOf("Success")>-1 || errString.equalsIgnoreCase("PRCUSUCCES")||errString.equals("PRCUSUCCES")||errString.equals("PRCUSUCCES"))
{
......
webitm-dis/src/ibase/webitm/ejb/dis/adv/PorderConf.java
View file @ 89dfd76f
......@@ -18,6 +18,7 @@ import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
import ibase.webitm.ejb.sys.CreateRCPXML;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.ITMException;
......@@ -352,10 +353,14 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
String indnoHdr = "",indNo = "",unitStd = "", enqNo = "", userid = "";
PreparedStatement pstmt2=null;
double totAmtProj=0.0,oqty = 0.0 ,quantity = 0.0 , ordqty = 0.0 ,totOrdQty = 0.0;
Timestamp reqDate = null;
String itemCode = "";
String siteCode = "";
try
{
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
HashMap demandSupplyMap = new HashMap();
if(loginEmpCode == null || loginEmpCode.trim().length() == 0)
{
userid = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -449,6 +454,34 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
}
}
/**Modified by Pavan Rane 24dec19 start[to update demand/supply in summary table(RunMRP process) related changes]*/
sql = "select site_code, line_no, item_code, quantity__stduom, dlv_date from porddet where purc_order = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, pOrder);
rs = pstmt.executeQuery();
while(rs.next())
{
demandSupplyMap.put("site_code", rs.getString("site_code"));
demandSupplyMap.put("item_code", rs.getString("item_code"));
demandSupplyMap.put("ref_ser", "P-ORD");
demandSupplyMap.put("ref_id", pOrder);
demandSupplyMap.put("ref_line", rs.getString("line_no"));
demandSupplyMap.put("due_date", rs.getTimestamp("dlv_date"));
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", rs.getDouble("quantity__stduom"));
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"));
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]*/
if(errString == null || errString.trim().length() == 0)
{
sql = " update porder set confirmed = 'Y',conf_date = ?,emp_code__aprv = ? ,status = 'O',status_date = ? " +
......@@ -576,8 +609,11 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
if(indNo != null && indNo.trim().length() > 0)
{
sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
//sql1 = "select quantity__stduom, ord_qty, from indent where ind_no = ? ";
sql1 = "select quantity__stduom, ord_qty, req_date, item_code, site_code from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, indNo);
rs1 = pstmt1.executeQuery();
......@@ -586,6 +622,11 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
cnt = 0;
quantity = rs1.getDouble("quantity__stduom") ;
ordqty = rs1.getDouble("ord_qty") ;
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
reqDate = rs1.getTimestamp("req_date");
itemCode = rs1.getString("item_code");
siteCode = rs1.getString("site_code");
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
cnt++;
}
rs1.close();rs1 = null;
......@@ -619,6 +660,27 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
pstmt1.close();
pstmt1 = null;
}
/**Added by Pavan Rane 24dec19 start[to update with demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code", siteCode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", indNo);
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", totOrdQty *(-1));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"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 with demand/supply in summary table(RunMRP process) related changes]*/
}
}
......@@ -693,8 +755,10 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
if(indNo != null && indNo.trim().length() > 0)
{
sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
//sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
sql1 = "select quantity__stduom, ord_qty, req_date, item_code, site_code from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, indNo);
rs1 = pstmt1.executeQuery();
......@@ -703,6 +767,11 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
cnt = 0;
quantity = rs1.getDouble("quantity__stduom") ;
ordqty = rs1.getDouble("ord_qty") ;
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
reqDate = rs1.getTimestamp("req_date");
itemCode = rs1.getString("item_code");
siteCode = rs1.getString("site_code");
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
cnt++;
}
rs1.close();rs1 = null;
......@@ -736,6 +805,27 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
pstmt1.close();
pstmt1 = null;
}
/**Added by Pavan Rane 24dec19 start[to update with demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code", siteCode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", indNo);
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", totOrdQty *(-1));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"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 with demand/supply in summary table(RunMRP process) related changes]*/
}
}
......@@ -861,7 +951,10 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
if(indNo != null && indNo.trim().length() > 0)
{
sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
//sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
sql1 = "select quantity__stduom, ord_qty, req_date, item_code, site_code from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, indNo);
rs1 = pstmt1.executeQuery();
......@@ -870,6 +963,11 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
cnt = 0;
quantity = rs1.getDouble("quantity__stduom") ;
ordqty = rs1.getDouble("ord_qty") ;
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
reqDate = rs1.getTimestamp("req_date") ;
itemCode = rs1.getString("item_code") ;
siteCode = rs1.getString("site_code") ;
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
cnt++;
}
rs1.close();rs1 = null;
......@@ -903,6 +1001,27 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
pstmt1.close();
pstmt1 = null;
}
/**Added by Pavan Rane 24dec19 start[to update with demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code", siteCode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", indNo);
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", totOrdQty *(-1));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"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 with demand/supply in summary table(RunMRP process) related changes]*/
}
}
......@@ -969,8 +1088,13 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
quantity = 0.0 , ordqty = 0.0 ,totOrdQty = 0.0;
java.sql.Timestamp currDate = null;
currDate = new java.sql.Timestamp(System.currentTimeMillis()) ;
Timestamp reqDate = null;
String itemCode = "";
String sitecode = "";
try
{
InvDemSuppTraceBean invDemSupTrcBean = new InvDemSuppTraceBean();
HashMap demandSupplyMap = new HashMap();
sql = "select count(*) from porddet where purc_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, pOrder);
......@@ -1193,7 +1317,10 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
rs1.close();rs1 = null;
pstmt1.close();pstmt1 = null;
sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
//sql1 = "select quantity__stduom, ord_qty from indent where ind_no = ? ";
sql1 = "select quantity__stduom, ord_qty, req_date, item_code, site_code from indent where ind_no = ? ";
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, indNo);
rs1 = pstmt1.executeQuery();
......@@ -1202,6 +1329,11 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
cnt = 0;
quantity = rs1.getDouble("quantity__stduom") ;
ordqty = rs1.getDouble("ord_qty") ;
/**Modified by Pavan Rane 24dec19 start[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
reqDate = rs1.getTimestamp("req_date") ;
itemCode = rs1.getString("item_code") ;
sitecode = rs1.getString("site_code");
/**Modified by Pavan Rane 24dec19 end[fetching extra columns to update with demand/supply in summary table(RunMRP process) related changes]*/
cnt++;
}
rs1.close();rs1 = null;
......@@ -1240,7 +1372,27 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
pstmt1.close();
pstmt1 = null;
}
/**Added by Pavan Rane 24dec19 start[to update with demand/supply in summary table(RunMRP process) related changes]*/
demandSupplyMap.put("site_code", sitecode);
demandSupplyMap.put("item_code", itemCode);
demandSupplyMap.put("ref_ser", "IND");
demandSupplyMap.put("ref_id", indNo);
demandSupplyMap.put("ref_line", "NA");
demandSupplyMap.put("due_date", reqDate);
demandSupplyMap.put("demand_qty", 0.0);
demandSupplyMap.put("supply_qty", totOrdQty *(-1));
demandSupplyMap.put("change_type", "C");
demandSupplyMap.put("chg_process", "T");
demandSupplyMap.put("chg_user", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
demandSupplyMap.put("chg_term", genericUtility.getValueFromXTRA_PARAMS(xtraParams,"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 with demand/supply in summary table(RunMRP process) related changes]*/
}
......
webitm-dis/src/ibase/webitm/ejb/dis/adv/PorderOpenPrc.java
View file @ 89dfd76f
......@@ -1221,7 +1221,11 @@ public class PorderOpenPrc extends ProcessEJB implements PorderOpenPrcLocal,Pord
// String tranIdPe;
String forcedFlag="";
errString = Conf.ConfirmPordAmd(tranIdPe, conn);//(tranIdPe, xtraParams, forcedFlag);
/**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]*/
//errString = Conf.ConfirmPordAmd(tranIdPe, conn);//(tranIdPe, xtraParams, forcedFlag);
errString = Conf.ConfirmPordAmd(tranIdPe, xtraParams, conn);
/**Modified by Pavan Rane 24dec19 end[changed the mtheod signature in POrderAmdConf component]*/
System.out.println("errString@conf@"+errString);
if(errString==null||errString.trim().length()==0 || errString.indexOf("Success")>-1 || errString.equalsIgnoreCase("PRCUSUCCES")||errString.equals("PRCUSUCCES")||errString.equals("PRCUSUCCES"))
{
......
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