Commit 89dfd76f authored by prane's avatar prane

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
...@@ -11,6 +11,7 @@ import ibase.utility.CommonConstants; ...@@ -11,6 +11,7 @@ import ibase.utility.CommonConstants;
import ibase.webitm.utility.*; import ibase.webitm.utility.*;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
import ibase.webitm.ejb.mfg.ExplodeBom; import ibase.webitm.ejb.mfg.ExplodeBom;
import ibase.webitm.ejb.mfg.InvDemSuppTraceBean;
import ibase.webitm.ejb.mfg.adv.RcpBackflushConfirm; import ibase.webitm.ejb.mfg.adv.RcpBackflushConfirm;
import ibase.webitm.ejb.sys.*; import ibase.webitm.ejb.sys.*;
import ibase.system.config.*; import ibase.system.config.*;
...@@ -1385,6 +1386,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1385,6 +1386,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
InvAllocTraceBean invAllocTrace = null; InvAllocTraceBean invAllocTrace = null;
HashMap strAllocate = null; HashMap strAllocate = null;
//Manish Mhatre 16oct19 end [to de-allocate free qty customer stock] //Manish Mhatre 16oct19 end [to de-allocate free qty customer stock]
Timestamp dlvDate = null;
try try
{ {
//Manish Mhatre 16oct19 start [to de-allocate free qty customer stock] //Manish Mhatre 16oct19 start [to de-allocate free qty customer stock]
...@@ -1394,6 +1396,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1394,6 +1396,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//Manish Mhatre 16oct19 end [to de-allocate free qty customer stock] //Manish Mhatre 16oct19 end [to de-allocate free qty customer stock]
DistCommon distCommon = new DistCommon(); 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 = ? ";
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); pstmt = conn.prepareStatement(sql);
...@@ -1861,7 +1865,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1861,7 +1865,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// ///////////////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////////////
if (purcOrder != null) 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 = conn.prepareStatement(sql);
pstmt1.setString(1, purcOrder); pstmt1.setString(1, purcOrder);
pstmt1.setString(2, pordLine); pstmt1.setString(2, pordLine);
...@@ -1872,6 +1876,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1872,6 +1876,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
dlvQuantity = rs1.getDouble("dlv_qty"); dlvQuantity = rs1.getDouble("dlv_qty");
ordStatus = rs1.getString("status"); ordStatus = rs1.getString("status");
siteCodeDet = rs1.getString("site_code"); 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.close();
pstmt1 = null; pstmt1 = null;
...@@ -2545,6 +2551,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2545,6 +2551,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
pstmtUpd.close(); pstmtUpd.close();
pstmtUpd = null; 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 // Changed By Pragyan on 25/02/15 to fix bug as suggested by
// Manohran sir // Manohran sir
......
...@@ -1472,7 +1472,11 @@ public class PorderClosePrc extends ProcessEJB implements PorderClosePrcLocal, ...@@ -1472,7 +1472,11 @@ public class PorderClosePrc extends ProcessEJB implements PorderClosePrcLocal,
//Calling confirm function of purchase order confirm //Calling confirm function of purchase order confirm
String forcedFlag = ""; 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); 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")) if(errString==null||errString.trim().length()==0 || errString.indexOf("Success")>-1 || errString.equalsIgnoreCase("PRCUSUCCES")||errString.equals("PRCUSUCCES")||errString.equals("PRCUSUCCES"))
{ {
......
...@@ -1221,7 +1221,11 @@ public class PorderOpenPrc extends ProcessEJB implements PorderOpenPrcLocal,Pord ...@@ -1221,7 +1221,11 @@ public class PorderOpenPrc extends ProcessEJB implements PorderOpenPrcLocal,Pord
// String tranIdPe; // String tranIdPe;
String forcedFlag=""; 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); 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")) 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