Skip to content

B
business-java
Commit 4a5863d0 authored by msingh's avatar msingh
Browse files
Options

Changes Merging for DDWMS. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99114 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8ae8fdf0
Hide whitespace changes
Inline Side-by-side
Showing with 885 additions and 346 deletions
webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java
View file @ 4a5863d0
......@@ -19,6 +19,12 @@ import org.w3c.dom.Document;
public class ConsolidatToDoc {
GenericUtility genericUtility = GenericUtility.getInstance();
//Changed by Manish on 05/11/15 [Start]
String projectName = "";
DistCommon distCommon = new DistCommon();
//Changed by Manish on 05/11/15 [End]
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user
......@@ -368,10 +374,31 @@ public class ConsolidatToDoc {
expLev = rs.getString("EXP_LEV");
lineNoSord = rs.getString("LINE_NO__SORD");//Gulzar on 12/28/2011
//Changed by sumit on 12/03/13 calculating number of art start
// Changed by Manish on 05/11/15 for DDWMS merging [start]
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equalsIgnoreCase(projectName))
{
if(lotNo == null || lotNo.trim().length() == 0)
{
lotNo =" ";
}
if(lotSl == null || lotSl.trim().length()==0)
{
lotSl = " ";
}
}
// Changed by Manish on 05/11/15 for DDWMS merging [end]
HashMap itmVolumeMap = new HashMap();
itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");
noArt = (int) (quantity / shipperSize);
// Changed by Manish on 05/11/15 for DDWMS merging [start]
if(!"DDUK".equalsIgnoreCase(projectName))
{
noArt = (int) (quantity / shipperSize);
}
// Changed by Manish on 05/11/15 for DDWMS merging [end]
if( noArt == 0 )
{
noArt = 1;
......@@ -491,7 +518,7 @@ public class ConsolidatToDoc {
}
System.out.println("pick/repl order ["+pickOrder.trim()+"] site code ["+siteCode.trim()+"] item code ["+itemCode.trim()+"] loc code ["+locCode.trim()+"]");
System.out.println("lot no ["+lotNo.trim()+"] lot sl["+lotSl.trim()+"] no art ["+noArt+"] quantity["+quantity+"] sale_order["+saleOrder.trim()+"]");
System.out.println("lot no ["+lotNo+"] lot sl["+lotSl+"] no art ["+noArt+"] quantity["+quantity+"] sale_order["+saleOrder.trim()+"]");
//Changes by gulzar on 29/12/11
//Form sorditem
......@@ -849,8 +876,17 @@ public class ConsolidatToDoc {
}
pstmt1.setString(7, itemCode.trim());
pstmt1.setString(8, lotNo.trim());
pstmt1.setString(9, lotSl.trim());
if("DDUK".equalsIgnoreCase(projectName))
{
pstmt1.setString(8, lotNo);
pstmt1.setString(9, lotSl);
}
else
{
pstmt1.setString(8, lotNo.trim());
pstmt1.setString(9, lotSl.trim());
}
pstmt1.setDouble(10, quantityOrd);
//Changed by sumit on 01/02/13 inserting qty as per ordered unit
//pstmt1.setDouble(11, quantity);
......
webitm-wms/ibase/webitm/ejb/wms/DockTranConf.java
View file @ 4a5863d0
......@@ -232,7 +232,6 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
rs = pstmt.executeQuery();
while(rs.next())
{
itemCode = rs.getString( "item_code" );
siteCode = rs.getString( "site_code" );
locCode = rs.getString( "loc_code" );
......@@ -249,6 +248,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
pickisstranId = rs.getString( "TRAN_ID__ISS" );
System.out.println("pick type from hdr->> ["+pickType+"]");
System.out.println("tranIdissue->> ["+pickisstranId+"]");
System.out.println("lotNo->> ["+lotNo+"] lotSl : ["+lotSl+"]");
// 16/10/11 manoharan check whether allocation against sales order is there
// if allocation against sales order found change allocation to point to loc_code__to
// and deallocate the same for loc_code in stock
......
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 4a5863d0
......@@ -142,6 +142,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
//conn.setAutoCommit(false);
if("DDUK".equalsIgnoreCase(projectCode))
{
ptcn = palletNo ;
sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.ptcn = ? AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, ptcn);
......
webitm-wms/ibase/webitm/ejb/wms/LocWisePickWizIC.java
View file @ 4a5863d0
......@@ -1583,7 +1583,8 @@ public class LocWisePickWizIC extends ValidatorEJB implements LocWisePickWizICLo
unit = rs.getString("UNIT");
noArt = rs.getDouble("NO_ART");
lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
lotNo = rs.getString("LOT_NO");
lpnNo = rs.getString("LOT_SL");//CHANGED @@
itmVolumeMap.clear();
itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssConf.java
View file @ 4a5863d0
......@@ -6,15 +6,18 @@ import ibase.webitm.ejb.*;
import ibase.webitm.ejb.dis.*;
import ibase.system.config.*;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
import java.io.*;
import java.rmi.RemoteException;
import java.sql.*;
import java.util.*;
import java.text.*;
import javax.ejb.*;
import javax.naming.InitialContext;
import javax.ejb.Stateless;
import org.w3c.dom.*;
import java.util.Date;
......@@ -28,6 +31,10 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
* @param : tranId
* @param : xtraParams
*/
String projectName = ""; //Changed by wasim on 06-11-15 for DDUK project
CommonWmsUtil commonWmsUtility = CommonWmsUtil.getInstance();
public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
{
String retString = "";
......@@ -169,6 +176,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
invPndReserve = discommon.getDisparams("999999","PND_INVSTAT",conn);
dsoInvstat = discommon.getDisparams( "999999", "DEEP_STORE_INVSTAT", conn );
//Changed by Rohna on 25-03-13 for set Actual qty zero when repanishment confirm.end
projectName = discommon.getDisparams("999999","PROJECT",conn); //Changed by wasim on 06-11-15 for DDUK project
conn.setAutoCommit(false);
......@@ -286,8 +295,21 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
itemCode = checkNullAndTrim(rs.getString( "item_code" ));
siteCode = checkNullAndTrim(rs.getString( "site_code" ));
locCode = checkNullAndTrim(rs.getString( "loc_code" ));
lotNo = checkNullAndTrim(rs.getString( "lot_no" ));
lotSl = checkNullAndTrim(rs.getString( "lot_sl" ));
//Changed by wasim on 22-06-2015 to remove checknullandtrim for DDUK[START]
if("DDUK".equalsIgnoreCase(projectName))
{
lotNo = rs.getString( "lot_no" );
lotSl = rs.getString( "lot_sl" );
}
else
{
lotNo = checkNullAndTrim(rs.getString( "lot_no" ));
lotSl = checkNullAndTrim(rs.getString( "lot_sl" ));
}
//lotNo = checkNullAndTrim(rs.getString( "lot_no" ));
//lotSl = checkNullAndTrim(rs.getString( "lot_sl" ));
//Changed by wasim on 22-06-2015 to remove checknullandtrim for DDUK [END]
quantity = rs.getDouble( "quantity" );
noArt = rs.getDouble( "no_art" );
locCodeTo = checkNullAndTrim(rs.getString( "loc_code__to" ));
......@@ -381,11 +403,15 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
System.out.println("Pick Quantity:="+pickQty);
System.out.println("Actual Quantity:="+actualQty);
System.out.println("Actual Allocate Quantity:="+actualAllocQty);*/
if("V".equalsIgnoreCase(orderType))
//Changed by wasim on 06-11-2015 for DDUK project [START]
/*if("V".equalsIgnoreCase(orderType))
{*/
if("V".equalsIgnoreCase(orderType) && !"DDUK".equalsIgnoreCase(projectName))
{
actualQty = 0.0;
}
//Changed by wasim on 06-11-2015 for DDUK project [END]
else
{
actualQty = quantity - pickQty;
......@@ -671,69 +697,96 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
/*sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ? " +
" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
//changed by manish on 18/09/15 for Ms sql server database
if("mssql".equalsIgnoreCase(DB))
//Changed by wasim on 06-11-2015 for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER , REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ) D "
+ " ON PICK_ORD_DET.REPL_ORDER = D.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = D.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER,REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ((SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? )) B "
+ " ON REPL_ORD_DET.PICK_ORDER = B.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = B.LINE_NO ) C "
+ " ON PICK_ORD_DET.REPL_ORDER = C.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = C.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET WHERE REPL_ORD_DET.PICK_ORDER =? AND REPL_ORD_DET.LINE_NO__PICK = ? ) E "
+ " ON REPL_ORD_DET.PICK_ORDER = E.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = E.LINE_NO ) F "
+ " ON REPL_ORD_DET.PICK_ORDER = F.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = F.LINE_NO ) G "
+ " ON PICK_ORD_DET.REPL_ORDER = G.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = G.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND "
+ " (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
pstmtPick = conn.prepareStatement(sql);
pstmtPick.setString(1, replOrder);
pstmtPick.setInt(2, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.start
pstmtPick.setString(3, replOrder);
pstmtPick.setInt(4, replOrderLineNo);
pstmtPick.setString(5, replOrder);
pstmtPick.setInt(6, replOrderLineNo);
}
//changed by manish on 18/09/15 for Ms sql server database
else
{
sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+ " UNION ALL"
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ("
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN (("
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? )))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND "
+ " (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
//changed by manish on 18/09/15 for Ms sql server database
if("mssql".equalsIgnoreCase(DB))
{
sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER , REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ) D "
+ " ON PICK_ORD_DET.REPL_ORDER = D.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = D.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER,REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ((SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? )) B "
+ " ON REPL_ORD_DET.PICK_ORDER = B.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = B.LINE_NO ) C "
+ " ON PICK_ORD_DET.REPL_ORDER = C.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = C.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+ " UNION ALL "
+ " SELECT PICK_ORD_DET.* FROM PICK_ORD_DET INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET "
+ " INNER JOIN ( SELECT REPL_ORD_DET.REPL_ORDER, REPL_ORD_DET.LINE_NO FROM REPL_ORD_DET WHERE REPL_ORD_DET.PICK_ORDER =? AND REPL_ORD_DET.LINE_NO__PICK = ? ) E "
+ " ON REPL_ORD_DET.PICK_ORDER = E.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = E.LINE_NO ) F "
+ " ON REPL_ORD_DET.PICK_ORDER = F.REPL_ORDER AND REPL_ORD_DET.LINE_NO__PICK = F.LINE_NO ) G "
+ " ON PICK_ORD_DET.REPL_ORDER = G.REPL_ORDER AND PICK_ORD_DET.LINE_NO__REPL = G.LINE_NO "
+ " AND dbo.FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND "
+ " (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
}
//changed by manish on 18/09/15 for Ms sql server database
else
{
sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+ " UNION ALL"
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ("
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN (("
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? )))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND "
+ " (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
}
//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
pstmtPick = conn.prepareStatement(sql);
pstmtPick.setString(1, replOrder);
pstmtPick.setInt(2, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.start
pstmtPick.setString(3, replOrder);
pstmtPick.setInt(4, replOrderLineNo);
pstmtPick.setString(5, replOrder);
pstmtPick.setInt(6, replOrderLineNo);
pstmtPick.setString(7, replOrder);
pstmtPick.setInt(8, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
}
//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
pstmtPick = conn.prepareStatement(sql);
pstmtPick.setString(1, replOrder);
pstmtPick.setInt(2, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.start
pstmtPick.setString(3, replOrder);
pstmtPick.setInt(4, replOrderLineNo);
pstmtPick.setString(5, replOrder);
pstmtPick.setInt(6, replOrderLineNo);
pstmtPick.setString(7, replOrder);
pstmtPick.setInt(8, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
//Changed by wasim on 06-11-2015 for DDUK project [END]
rsPick = pstmtPick.executeQuery();
//Changed by sumit on 08/02/13 change to while
......@@ -1955,8 +2008,12 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
pstmt = con.prepareStatement(sql);
if(lotNo != null && lotNo.length() > 0)
//Changed by wasim on 06-11-2015 to trim the lotno [START]
//if(lotNo != null && lotNo.length() > 0)
//{
if(lotNo != null && (lotNo.trim()).length() > 0)
{
//Changed by wasim on 06-11-2015 to trim the lotno [END]
pstmt.setString(1, lotNo);
pstmt.setString(2, lotNo);
}
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 4a5863d0
......@@ -30,6 +30,7 @@ import ibase.webitm.ejb.*;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
@javax.ejb.Stateless
public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssICRemote
......@@ -40,6 +41,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Added by Manish on 16/09/2015 for Ms Sql Server.
String DB = CommonConstants.DB_NAME;
String projectName = ""; //Changed by wasim on 06-11-15 for DDUK project
CommonWmsUtil commonWmsUtility = CommonWmsUtil.getInstance();
public String wfValData() throws RemoteException, ITMException
{
......@@ -207,8 +210,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
double stockalloocqty = 0.0;
double sordallocqty = 0.0;
double activeReplQty = 0.0;
String stkOpt = "";//changed by wasim on 06-11-2015 for dduk project
try
{
int currentFormNo = 0;
......@@ -227,7 +230,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
NodeList parentList = currFormDataDom.getElementsByTagName( "Detail" + currentFormNo );
NodeList childList = null;
noOfParent = parentList.getLength();
noOfParent = parentList.getLength();
projectName = checkNull(distCommon.getDisparams("999999","PROJECT",conn)); //Changed by wasim on 06-11-15 for DDUK project
switch ( currentFormNo ) // Switch Case for form number
{
......@@ -1092,8 +1097,71 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
System.out.println("lo2="+genericUtility.getColumnValue("line_no__ord", allFormDataDom, "3" ) );
lineNoOrd = Integer.parseInt( genericUtility.getColumnValue("line_no__ord", allFormDataDom, "3" ) );
//changed by wasim on 16-06-2015 to check for stk_opt from siteitem for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
itemCd = checkNull(genericUtility.getColumnValue("item_code", allFormDataDom, "3" ));
stkOpt = commonWmsUtility.getStockOption(itemCd, conn);
System.out.println("Stock Opt received="+stkOpt);
if("0".equals(stkOpt))
{
sql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, lpnNo );
pstmt.setString( 2, replOrder );
pstmt.setInt( 3, lineNoOrd );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( count <= 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "lot_sl", "INVLDLOTSL", userId );
//break;
errList.add( "INVLDLOTSL" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
}
}
else
{
sql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, lpnNo );
pstmt.setString( 2, replOrder );
pstmt.setInt( 3, lineNoOrd );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?";
if( count <= 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "lot_sl", "INVLDLOTSL", userId );
//break;
errList.add( "INVLDLOTSL" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
}
/*sql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, lpnNo );
pstmt.setString( 2, replOrder );
......@@ -1116,7 +1184,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
errList.add( "INVLDLOTSL" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
}*/
//changed by wasim on 06-11-2015 to check for stk_opt from siteitem for DDUK project [END]
}
//else if ( "lot_sl_new".equalsIgnoreCase( childNodeName ) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
//Changed by Dadaso pawar on 09/06/15 [Start] [W15CSUN004]
......@@ -1130,108 +1199,182 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//lotSlNew = genericUtility.getColumnValue("lot_sl_new", allFormDataDom, "3" );
lotSlNew = genericUtility.getColumnValue("lot_sl__new", allFormDataDom, "3" );
replOrder = checkNull(genericUtility.getColumnValue("repl_order", allFormDataDom, "3" ));
//changes by Dadaso pawar on 27/03/15 as per Pragyan
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("Order Type in ReplissIC befour if:["+orderType+"]");
//Changed by Dadaso pawar on 13/07/15 [Start] //lot_sl__new should not duplicate
/*if(!"V".equalsIgnoreCase(orderType))
{*/
//Changed by Dadaso pawar on 13/07/15 [End] //lot_sl__new should not duplicate
System.out.println("Order Type in ReplissIC within if:["+orderType+"]");
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
if(!lotSlNew.startsWith("NJ") && !lotSlNew.startsWith("CN") && !lotSlNew.startsWith("DM") && !lotSlNew.startsWith("EX") )
{
errList.add( "VTINVLPN" );
errFields.add( childNodeName.toLowerCase());
}
if(lotSlNew.length() != 10)
{
errList.add( "VTINVLEN" );
errFields.add( childNodeName.toLowerCase());
}
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
//Changed by sumit on 22/05/13 checking duplicate lot_sl__new from dom and stock start.
//Changed by Rohan on 25-05-13 for checking duplicate lpn site wise
//sql = " SELECT LOT_SL FROM STOCK WHERE LOT_SL = ?";
sql = " SELECT LOT_SL FROM STOCK WHERE LOT_SL = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, lotSlNew );
//Changed by Rohan on 25-05-13 for checking duplicate lpn site wise
pstmt.setString(2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
//Changed by wasim 0n 06-11-15 for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
errList.add( "DUPLOTSLNW" );
errFields.add( childNodeName.toLowerCase() );
itemCd = checkNull(genericUtility.getColumnValue("item_code", allFormDataDom, "3" ));
System.out.println("Item Code is="+itemCd);
stkOpt = commonWmsUtility.getStockOption(itemCd, conn);
System.out.println("Stock Opt received="+stkOpt);
if("0".equals(stkOpt))
{
sql = " SELECT LOT_SL FROM STOCK WHERE LOT_SL = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, lotSlNew );
//Changed by Rohan on 25-05-13 for checking duplicate lpn site wise
pstmt.setString(2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
errList.add( "DUPLOTSLNW" );
errFields.add( childNodeName.toLowerCase() );
}
else
{
ArrayList arrayList = checkDuplicaterecord(allFormDataDom);
Set set = new HashSet(arrayList);
System.out.println("Size of arrayList ["+arrayList.size()+"]");
System.out.println("Size of Set ["+set.size()+"]");
if(set.size() < arrayList.size())
{
errList.add( "DUPLOTSLNW" );
errFields.add( childNodeName.toLowerCase() );
}
set.clear();
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
//Changed by sumit on 22/05/13 checking duplicate lot_sl__new from dom and stock end.
sql = "select pick_order from repl_ord_det where repl_order= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
pickOrder = rs.getString("pick_order") == null?"":rs.getString("pick_order");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select pick_type from pick_ord_hdr where pick_order = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
orderType = rs.getString("pick_type") == null?"":rs.getString("pick_type");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((lotSlNew == null || lotSlNew.trim().length()== 0) && "A".equalsIgnoreCase(orderType) )
{
errList.add( "LPNORDTYPE" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
else
{
ArrayList arrayList = checkDuplicaterecord(allFormDataDom);
Set set = new HashSet(arrayList);
System.out.println("Size of arrayList ["+arrayList.size()+"]");
System.out.println("Size of Set ["+set.size()+"]");
if(set.size() < arrayList.size())
//changes by Dadaso pawar on 27/03/15 as per Pragyan
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("Order Type in ReplissIC befour if:["+orderType+"]");
//Changed by Dadaso pawar on 13/07/15 [Start] //lot_sl__new should not duplicate
/*if(!"V".equalsIgnoreCase(orderType))
{*/
//Changed by Dadaso pawar on 13/07/15 [End] //lot_sl__new should not duplicate
System.out.println("Order Type in ReplissIC within if:["+orderType+"]");
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
if(!lotSlNew.startsWith("NJ") && !lotSlNew.startsWith("CN") && !lotSlNew.startsWith("DM") && !lotSlNew.startsWith("EX") )
{
errList.add( "VTINVLPN" );
errFields.add( childNodeName.toLowerCase());
}
if(lotSlNew.length() != 10)
{
errList.add( "VTINVLEN" );
errFields.add( childNodeName.toLowerCase());
}
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
//Changed by sumit on 22/05/13 checking duplicate lot_sl__new from dom and stock start.
//Changed by Rohan on 25-05-13 for checking duplicate lpn site wise
//sql = " SELECT LOT_SL FROM STOCK WHERE LOT_SL = ?";
sql = " SELECT LOT_SL FROM STOCK WHERE LOT_SL = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, lotSlNew );
//Changed by Rohan on 25-05-13 for checking duplicate lpn site wise
pstmt.setString(2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
errList.add( "DUPLOTSLNW" );
errFields.add( childNodeName.toLowerCase() );
}
set.clear();
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
//Changed by sumit on 22/05/13 checking duplicate lot_sl__new from dom and stock end.
sql = "select pick_order from repl_ord_det where repl_order= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
pickOrder = rs.getString("pick_order") == null?"":rs.getString("pick_order");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select pick_type from pick_ord_hdr where pick_order = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
orderType = rs.getString("pick_type") == null?"":rs.getString("pick_type");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((lotSlNew == null || lotSlNew.trim().length()== 0) && "A".equalsIgnoreCase(orderType) )
{
errList.add( "LPNORDTYPE" );
errFields.add( childNodeName.toLowerCase() );
}
}
else
{
ArrayList arrayList = checkDuplicaterecord(allFormDataDom);
Set set = new HashSet(arrayList);
System.out.println("Size of arrayList ["+arrayList.size()+"]");
System.out.println("Size of Set ["+set.size()+"]");
if(set.size() < arrayList.size())
{
errList.add( "DUPLOTSLNW" );
errFields.add( childNodeName.toLowerCase() );
}
set.clear();
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
//Changed by sumit on 22/05/13 checking duplicate lot_sl__new from dom and stock end.
sql = "select pick_order from repl_ord_det where repl_order= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
pickOrder = rs.getString("pick_order") == null?"":rs.getString("pick_order");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select pick_type from pick_ord_hdr where pick_order = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
orderType = rs.getString("pick_type") == null?"":rs.getString("pick_type");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((lotSlNew == null || lotSlNew.trim().length()== 0) && "A".equalsIgnoreCase(orderType) )
{
errList.add( "LPNORDTYPE" );
errFields.add( childNodeName.toLowerCase() );
}
//}//Changed by Dadaso pawar on 13/07/15 [Start] //lot_sl__new should not duplicate
}
//Changed by wasim 0n 06-11-15 for DDUK project [START]
}
//Commented By mahesh Patidar on 01/08/12
//Changed by Dadaso pawar on 09/06/15 [Start]
......@@ -1276,11 +1419,11 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Changed by Dadaso 27/03/2015 as per pragyan sir
//Consolidated Change
//if (!"A".equals(orderType) && !"E".equals(orderType) && !"Q".equals(orderType) && !"T".equals(orderType))
if (!"A".equals(orderType) && !"E".equals(orderType) && !"Q".equals(orderType) && !"T".equals(orderType) && !"U".equals(orderType) && !"V".equals(orderType))
{
{
if ( !("L".equalsIgnoreCase(orderType)))
{
sql = "SELECT SINGLE_LOT_SL, ITEM_LOT_OPT FROM LOCATION WHERE LOC_CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
......@@ -1832,21 +1975,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
itemCode = genericUtility.getColumnValue("item_code", currFormDataDom );
lotNo = genericUtility.getColumnValue("lot_no", currFormDataDom );
System.out.println(" noArt ["+noArt+"] replOrder ["+replOrder+"]");
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if(!"V".equalsIgnoreCase(orderType))
//Changed by wasim on 06-11-15 for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
if( noArt == null || noArt.trim().length() == 0 )
{
......@@ -1860,7 +1991,169 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
}
else
{
double tempNoArt = 0.0;
//changed by wasim on 16-06-2015 based on stk_opt value [START]
stkOpt = commonWmsUtility.getStockOption(itemCode, conn);
System.out.println("Stock Opt received="+stkOpt);
if("0".equals(stkOpt))
{
double tempNoArt = 0.0;
sql = " SELECT RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL, SUM(RID.QUANTITY) AS QUANTITY , " +
" SUM(RID.NO_ART) AS NO_ART FROM REPL_ORD_DET RID WHERE RID.REPL_ORDER = ? AND ITEM_CODE = ? AND SITE_CODE = ? " +
" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +
" GROUP BY RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs = pstmt.executeQuery();
if( rs.next())
{
tempNoArt = rs.getDouble("NO_ART");
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
if ( Double.parseDouble(noArt) != tempNoArt)
{
errList.add( "INVNOOFART" );
errFields.add( childNodeName.toLowerCase() );
}
}
else
{
double tempNoArt = 0.0;
sql = " SELECT RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, SUM(RID.QUANTITY) AS QUANTITY , " +
" SUM(RID.NO_ART) AS NO_ART FROM REPL_ORD_DET RID WHERE RID.REPL_ORDER = ? AND ITEM_CODE = ? AND SITE_CODE = ? " +
" AND LOC_CODE = ? AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +
" GROUP BY RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
rs = pstmt.executeQuery();
if( rs.next())
{
tempNoArt = rs.getDouble("NO_ART");
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
if ( Double.parseDouble(noArt) != tempNoArt)
{
errList.add( "INVNOOFART" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
else
{
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if(!"V".equalsIgnoreCase(orderType))
{
if( noArt == null || noArt.trim().length() == 0 )
{
errList.add( "NULLNOART" );
errFields.add( childNodeName.toLowerCase() );
}
else if (!noArt.matches("((-|\\+)?[0-9]+(\\.[0-9]+)?)+")) // NO_ART SHOLUD BE A NUMBER
{
errList.add( "ARTNOTANUM" );
errFields.add( childNodeName.toLowerCase() );
}
else
{
double tempNoArt = 0.0;
sql = " SELECT RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL, SUM(RID.QUANTITY) AS QUANTITY , " +
" SUM(RID.NO_ART) AS NO_ART FROM REPL_ORD_DET RID WHERE RID.REPL_ORDER = ? AND ITEM_CODE = ? AND SITE_CODE = ? " +
" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +
" GROUP BY RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs = pstmt.executeQuery();
if( rs.next())
{
tempNoArt = rs.getDouble("NO_ART");
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
if ( Double.parseDouble(noArt) != tempNoArt)
{
errList.add( "INVNOOFART" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
//Changed by wasim on 06-11-15 for DDUK project [END]
}
//Changed by Dadaso pawar on 13/07/15 [Start]
else if ( "quantity".equalsIgnoreCase( childNodeName ) && ("consolidate_repl".equalsIgnoreCase(objName)) )
{
//Changed by wasim on 06-11-15 for DDUK project [START]
if(!"DDUK".equals(projectName))
{
String qtyStr = "";
double ordQuantity = 0,quantityL = 0;
System.out.println("quantity validation............");
replOrder = genericUtility.getColumnValue("repl_order", currFormDataDom );
qtyStr = checkNull(genericUtility.getColumnValue("quantity", currFormDataDom ));
locCode = genericUtility.getColumnValue("loc_code", currFormDataDom );
siteCode = genericUtility.getColumnValue("site_code", currFormDataDom );
lotSl = genericUtility.getColumnValue("lot_sl", currFormDataDom );
itemCode = genericUtility.getColumnValue("item_code", currFormDataDom );
lotNo = genericUtility.getColumnValue("lot_no", currFormDataDom );
System.out.println(" qtyStr ["+qtyStr+"] replOrder ["+replOrder+"]");
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("OrderType----->>["+orderType+"]");
if("V".equalsIgnoreCase(orderType))
{
if(qtyStr == null || qtyStr.trim().length() == 0)
{
errList.add( "VTQUNT2" );
errFields.add( childNodeName.toLowerCase() );
}
if (qtyStr == null || "null".equals(qtyStr) || qtyStr.trim().length() == 0)
{
qtyStr = "0";
}
quantityL = Double.parseDouble(qtyStr);
sql = " SELECT RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL, SUM(RID.QUANTITY) AS QUANTITY , " +
" SUM(RID.NO_ART) AS NO_ART FROM REPL_ORD_DET RID WHERE RID.REPL_ORDER = ? AND ITEM_CODE = ? AND SITE_CODE = ? " +
" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +
......@@ -1875,85 +2168,19 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
rs = pstmt.executeQuery();
if( rs.next())
{
tempNoArt = rs.getDouble("NO_ART");
ordQuantity = rs.getDouble("QUANTITY");
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
if ( Double.parseDouble(noArt) != tempNoArt)
System.out.println(" ordQuantity ["+ordQuantity+"] quantityL ["+quantityL+"]");
if(ordQuantity != quantityL)
{
errList.add( "INVNOOFART" );
errList.add( "VTQUANTDNM" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
//Changed by Dadaso pawar on 13/07/15 [Start]
else if ( "quantity".equalsIgnoreCase( childNodeName ) && ("consolidate_repl".equalsIgnoreCase(objName)) )
{
String qtyStr = "";
double ordQuantity = 0,quantityL = 0;
System.out.println("quantity validation............");
replOrder = genericUtility.getColumnValue("repl_order", currFormDataDom );
qtyStr = checkNull(genericUtility.getColumnValue("quantity", currFormDataDom ));
locCode = genericUtility.getColumnValue("loc_code", currFormDataDom );
siteCode = genericUtility.getColumnValue("site_code", currFormDataDom );
lotSl = genericUtility.getColumnValue("lot_sl", currFormDataDom );
itemCode = genericUtility.getColumnValue("item_code", currFormDataDom );
lotNo = genericUtility.getColumnValue("lot_no", currFormDataDom );
System.out.println(" qtyStr ["+qtyStr+"] replOrder ["+replOrder+"]");
sql = " SELECT ROH.ORDER_TYPE, WID.PTCN FROM REPL_ORD_HDR ROH, WAVE_TASK_DET WID WHERE ROH.REPL_ORDER = ? " +
" AND ROH.REPL_ORDER = WID.REF_ID ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if ( rs.next() )
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
ptcn = checkNull(rs.getString("PTCN"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("OrderType----->>["+orderType+"]");
if("V".equalsIgnoreCase(orderType))
{
if(qtyStr == null || qtyStr.trim().length() == 0)
{
errList.add( "VTQUNT2" );
errFields.add( childNodeName.toLowerCase() );
}
if (qtyStr == null || "null".equals(qtyStr) || qtyStr.trim().length() == 0)
{
qtyStr = "0";
}
quantityL = Double.parseDouble(qtyStr);
sql = " SELECT RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL, SUM(RID.QUANTITY) AS QUANTITY , " +
" SUM(RID.NO_ART) AS NO_ART FROM REPL_ORD_DET RID WHERE RID.REPL_ORDER = ? AND ITEM_CODE = ? AND SITE_CODE = ? " +
" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +
" GROUP BY RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, RID.LOT_SL ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs = pstmt.executeQuery();
if( rs.next())
{
ordQuantity = rs.getDouble("QUANTITY");
}
rs.close(); rs =null;
pstmt.close(); pstmt = null;
System.out.println(" ordQuantity ["+ordQuantity+"] quantityL ["+quantityL+"]");
if(ordQuantity != quantityL)
{
errList.add( "VTQUANTDNM" );
errFields.add( childNodeName.toLowerCase() );
}
}
//Changed by wasim on 06-11-15 for DDUK project [END]
}
//Changed by Dadaso pawar on 13/07/15 [End]
//Changed by sumit on 25/02/13 validation no_art end
......@@ -3100,8 +3327,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//else if ( "V".equalsIgnoreCase(pickType.trim()) )
else if ( "V".equalsIgnoreCase(pickType.trim()) || "U".equalsIgnoreCase(pickType.trim()))
{
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
varName = "STAG_INVSTAT";
//Changed by wasim on 06-11-15 for DDUK project [START]
if(!"DDUK".equalsIgnoreCase(projectName))
{
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
varName = "STAG_INVSTAT";
}
//Changed by wasim on 06-11-15 for DDUK project [END]
}
//Changed by samadhan on 11/05/2015 D14ISUN007 for Staging Area.End
......@@ -3638,8 +3870,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//changed by sankara on 18/11/13 for repl order set itm default
String assignTo = "";
String invstat = "";
String stkOpt = "";//Changed by wasim for DDUK project
try
{
GenericUtility genericUtility = GenericUtility.getInstance();
......@@ -3662,6 +3894,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
invDeepReserve = distComm.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
invPndReserve = distComm.getDisparams("999999","PND_INVSTAT",conn);
partialResrvLoc = distComm.getDisparams("999999","PRSRV_INVSTAT",conn);
projectName = checkNull(distComm.getDisparams("999999","PROJECT",conn)); //Changed by wasim on 06-11-15 for DDUK project
System.out.println("current form no["+currentFormNo+"]");
valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>").append( editFlag );
......@@ -4572,8 +4805,18 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull( siteCode )).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull( siteDescr )).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( checkNullAndTrim( locCode )).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( checkNullAndTrim( lotNo )).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( checkNullAndTrim( lpnNo )).append( "]]></lot_sl>\r\n" );
//Changed by wasim on 06-11-15 to remove check null for DDUK [START]
if("DDUK".equalsIgnoreCase(projectName))
{
valueXmlString.append( "<lot_no><![CDATA[" ).append(lotNo).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append(lpnNo).append( "]]></lot_sl>\r\n" );
}
else
{
valueXmlString.append( "<lot_no><![CDATA[" ).append( checkNullAndTrim( lotNo )).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( checkNullAndTrim( lpnNo )).append( "]]></lot_sl>\r\n" );
}
//Changed by wasim on 06-11-15 to remove check null for DDUK [END]
valueXmlString.append( "<quantity><![CDATA[" ).append( quantity).append( "]]></quantity>\r\n" );
valueXmlString.append( "<unit><![CDATA[" ).append( unit).append( "]]></unit>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
......@@ -4790,69 +5033,223 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
varName = "DOCKLOC_INVSTAT";
}
//Changed By Pragyan To check th pick type proper way.end
sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
" FROM REPL_ISS_DET RID WHERE RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.ITEM_CODE = ? " +
" AND RID.SITE_CODE = ? AND RID.LOC_CODE__SYS = ? AND RID.LOC_CODE = ? AND RID.LOT_NO = ? " +
" AND RID.LOT_SL = ? AND CASE WHEN RID.LOC_TO_ASSIGNED IS NULL THEN 'N' ELSE RID.LOC_TO_ASSIGNED end = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setInt(2, lineNoOrd);
pstmt.setString(3, itemCode);
pstmt.setString(4, siteCode);
pstmt.setString(5, locCodeSys);
pstmt.setString(6, locCode);
pstmt.setString(7, lotNo);
pstmt.setString(8, lotSl);
rs = pstmt.executeQuery();
if( rs.next() )
//changed by wasim on 16-06-2015 to check stk_opt value [START]
if("DDUK".equalsIgnoreCase(projectName))
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); newInt
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+newInt+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append(rs.getString("LOC_CODE__TO")).append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
stkOpt = commonWmsUtility.getStockOption(itemCode, conn);
System.out.println("Stock Opt received for REPL_ISS_DET="+stkOpt);
if("0".equals(stkOpt))
{
sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
" FROM REPL_ISS_DET RID WHERE RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.ITEM_CODE = ? " +
" AND RID.SITE_CODE = ? AND RID.LOC_CODE__SYS = ? AND RID.LOC_CODE = ? AND RID.LOT_NO = ? " +
" AND RID.LOT_SL = ? AND CASE WHEN RID.LOC_TO_ASSIGNED IS NULL THEN 'N' ELSE RID.LOC_TO_ASSIGNED end = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setInt(2, lineNoOrd);
pstmt.setString(3, itemCode);
pstmt.setString(4, siteCode);
pstmt.setString(5, locCodeSys);
pstmt.setString(6, locCode);
pstmt.setString(7, lotNo);
pstmt.setString(8, lotSl);
rs = pstmt.executeQuery();
if( rs.next() )
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); newInt
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+newInt+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append(rs.getString("LOC_CODE__TO")).append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
else
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+(newInt)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append("").append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
else
{
sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
" FROM REPL_ISS_DET RID WHERE RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.ITEM_CODE = ? " +
" AND RID.SITE_CODE = ? AND RID.LOC_CODE__SYS = ? AND RID.LOC_CODE = ? " +
" AND CASE WHEN RID.LOC_TO_ASSIGNED IS NULL THEN 'N' ELSE RID.LOC_TO_ASSIGNED end = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setInt(2, lineNoOrd);
pstmt.setString(3, itemCode);
pstmt.setString(4, siteCode);
pstmt.setString(5, locCodeSys);
pstmt.setString(6, locCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); newInt
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+newInt+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append(rs.getString("LOC_CODE__TO")).append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
System.out.println("Lot SL NEW="+lotSlNew);
if(lotSlNew !=null && lotSlNew.length() > 0)
{
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew).append( "]]></lot_sl__new>\r\n" );
}
else
{
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSl).append( "]]></lot_sl__new>\r\n" );
}
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
else
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+(newInt)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append("").append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
if(lotSlNew !=null && lotSlNew.length() > 0)
{
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew).append( "]]></lot_sl__new>\r\n" );
}
else
{
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSl).append( "]]></lot_sl__new>\r\n" );
}
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
else
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+(newInt)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append("").append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
{
sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
" FROM REPL_ISS_DET RID WHERE RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.ITEM_CODE = ? " +
" AND RID.SITE_CODE = ? AND RID.LOC_CODE__SYS = ? AND RID.LOC_CODE = ? AND RID.LOT_NO = ? " +
" AND RID.LOT_SL = ? AND CASE WHEN RID.LOC_TO_ASSIGNED IS NULL THEN 'N' ELSE RID.LOC_TO_ASSIGNED end = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
pstmt.setInt(2, lineNoOrd);
pstmt.setString(3, itemCode);
pstmt.setString(4, siteCode);
pstmt.setString(5, locCodeSys);
pstmt.setString(6, locCode);
pstmt.setString(7, lotNo);
pstmt.setString(8, lotSl);
rs = pstmt.executeQuery();
if( rs.next() )
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); newInt
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+newInt+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append(rs.getString("LOC_CODE__TO")).append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
else
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+(newInt)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append("").append( "]]></loc_code__to>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( itemDescr ).append( "]]></item_descr>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( siteDescr ).append( "]]></site_descr>\r\n" );
valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
valueXmlString.append( "<lot_sl><![CDATA[" ).append( lotSl ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(lotSlNew.trim()).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<repl_order><![CDATA[" ).append(replOrder).append( "]]></repl_order>\r\n" );
valueXmlString.append("</Detail4>\r\n");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//changed by wasim on 16-06-2015 to check stk_opt value [END]
}
}
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssPos.java
View file @ 4a5863d0
......@@ -13,6 +13,7 @@ import java.sql.*;
import java.util.TreeMap;
import javax.ejb.Stateless;
import org.w3c.dom.*;
import ibase.webitm.ejb.dis.DistCommon;
......@@ -21,6 +22,9 @@ import ibase.webitm.ejb.wms.ReplIssConf;
@Stateless
public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIssPosLocal
{
String projectName = ""; //Changed by wasim on 06-11-15 for DDUK project
DistCommon distComm = new DistCommon();
public String postSave( String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
{
System.out.println("--->postSave called xml str["+domString+"]");
......@@ -55,6 +59,8 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
boolean isConn= false;
try
{
projectName = checkNull(distComm.getDisparams("999999","PROJECT",conn));//Changed by wasim on 06-11-15 for DDUK project
dom = genericUtility.parseString(domString);
System.out.println("$$DOM@@--------->>["+genericUtility.serializeDom(dom)+"]");
......@@ -516,18 +522,34 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl", dom.getElementsByTagName("Detail3").item(row));
locCodeSys = GenericUtility.getInstance().getColumnValueFromNode("loc_code__sys", dom.getElementsByTagName("Detail3").item(row));
lotSlNew = GenericUtility.getInstance().getColumnValueFromNode("lot_sl__new", dom.getElementsByTagName("Detail3").item(row));
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
if( findNoart != null && findNoart.length() >0)
{
noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
//changed by wasim on 22-06-2015 to set lotSlNew as lot_sl if it is blank [START]
if("DDUK".equalsIgnoreCase(projectName))
{
System.out.println("lotSlNew is="+lotSlNew);
if(lotSlNew == null || lotSlNew.length() > 0)
{
System.out.println("Setting lotSlNew as LOT_SL");
lotSlNew = lotSl;
}
}
else
{
noArt = 1;
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
if( findNoart != null && findNoart.length() >0)
{
noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
}
else
{
noArt = 1;
}
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
}
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
//changed by wasim on 22-06-2015 to set lotSlNew as lot_sl if it is blank [END]
System.out.println(" replOrder ["+replOrder+"] lineNoOrd ["+lineNoOrd+"]");
System.out.println(" itemCode ["+itemCode+"] siteCode ["+siteCode+"] locCode["+locCode+"] lotNo["+lotNo+"] lotSl["+lotSl+"]");
......@@ -596,9 +618,18 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
" AND ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND TRAN_ID = ?";
pstmt2 = conn.prepareStatement(sql);
pstmt2.setDouble(1, quantity);
//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
pstmt2.setDouble(2, rs.getInt("NO_ART"));
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
//Changed by wasim on 06-11-15 for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
pstmt2.setInt(2, 1);
}
else
{
//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
pstmt2.setDouble(2, rs.getInt("NO_ART"));
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
}
//Changed by wasim on 06-11-15 for DDUK project [END]
pstmt2.setString(3, replOrder);
pstmt2.setInt(4, rs.getInt("LINE_NO"));
pstmt2.setString(5, itemCode);
......@@ -642,10 +673,19 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
pstmt2.setString(8, lotNo);
pstmt2.setString(9, lotSl);
pstmt2.setDouble(10, quantity);
//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
pstmt2.setInt(11, rs.getInt("NO_ART"));
//pstmt2.setDouble(11, 1);
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
//Changed by wasim on 06-11-15 for DDUK project [START]
if("DDUK".equalsIgnoreCase(projectName))
{
pstmt2.setInt(11, 1);
}
else
{
//Changed by Dadaso pawar on 10/06/15 [start] [W15CSUN004]
pstmt2.setInt(11, rs.getInt("NO_ART"));
//pstmt2.setDouble(11, 1);
//Changed by Dadaso pawar on 10/06/15 [End] [W15CSUN004]
}
//Changed by wasim on 06-11-15 for DDUK project [End]
pstmt2.setString(12, locCodeSys);
pstmt2.setString(13, lotSlNew);
update = 0;
......@@ -682,18 +722,25 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
lotNo = GenericUtility.getInstance().getColumnValueFromNode("lot_no", dom.getElementsByTagName("Detail4").item(row));
lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl", dom.getElementsByTagName("Detail4").item(row));
locCodeTo = GenericUtility.getInstance().getColumnValueFromNode("loc_code__to", dom.getElementsByTagName("Detail4").item(row));
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
if( findNoart != null && findNoart.length() >0)
{
noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
}
else
//Changed by wasim on 06-11-15 for DDUK project [START]
if(!"DDUK".equalsIgnoreCase(projectName))
{
noArt = 1;
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [Start]
//noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
String findNoart = GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row));
if( findNoart != null && findNoart.length() >0)
{
noArt = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("no_art", dom.getElementsByTagName("Detail3").item(row)));
}
else
{
noArt = 1;
}
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [End]
}
//Changes by Dadaso pawar on 27/03/15 as per Pragyan [End]
//Changed by wasim on 06-11-15 for DDUK project [END]
lotSlNew = GenericUtility.getInstance().getColumnValueFromNode("lot_sl__new", dom.getElementsByTagName("Detail3").item(row));
System.out.println(" replOrder ["+replOrder+"] ");
......
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