Skip to content

B
business-java
Commit 46749bb6 authored by msingh's avatar msingh
Browse files
Options

Change by Manish on 24/11/16 for Supplier Shipment Wizard. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104038 ce508802-f39f-4f6c-b175-0d175dae99d5
parent be84ce81
Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 37 deletions
webitm-wms/ibase/webitm/ejb/wms/PackLabelWizEJB.java
View file @ 46749bb6
...@@ -7,10 +7,15 @@ ...@@ -7,10 +7,15 @@
package ibase.webitm.ejb.wms; package ibase.webitm.ejb.wms;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.net.InetAddress;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -30,7 +35,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -30,7 +35,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
{ {
String globalXtraParams = null; String globalXtraParams = null;
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -136,7 +141,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -136,7 +141,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
String contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom)); String contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom));
String itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom)); String itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom));
String countSerSql = " SELECT ( MAX_QTY - QUANTITY_REL ) AS QUANTITY FROM PCONTRACT_DET WHERE CONTRACT_NO = ? AND ITEM_CODE = ? "; String countSerSql = " SELECT ( MAX_QTY - (CASE WHEN QUANTITY_REL IS NULL THEN 0 ELSE QUANTITY_REL END) ) AS QUANTITY FROM PCONTRACT_DET WHERE CONTRACT_NO = ? AND ITEM_CODE = ? ";
pstmt = conn.prepareStatement(countSerSql); pstmt = conn.prepareStatement(countSerSql);
pstmt.setString(1, contractNo); pstmt.setString(1, contractNo);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
...@@ -319,7 +324,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -319,7 +324,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
PreparedStatement pstmt = null,pstmtShipper = null; PreparedStatement pstmt = null,pstmtShipper = null;
ResultSet rs = null, rsShipper = null ; ResultSet rs = null, rsShipper = null ;
globalXtraParams = xtraParams; globalXtraParams = xtraParams;
String sql = "",userId = "",loginSiteCode = "",chgTerm = "",siteCodeDescr = "",currDateStr = ""; String sql = "",userId = "",loginSiteCode = "",chgTerm = "",siteCode = "",siteCodeDescr = "",currDateStr = "",purcOrder = "",contractNo = "";
int currentFormNo = 0; int currentFormNo = 0;
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
...@@ -341,14 +346,16 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -341,14 +346,16 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ); loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1));
sql = "SELECT DESCR FROM SITE WHERE SITE_CODE = ?"; sql = "SELECT DESCR FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode); pstmt.setString(1,siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
siteCodeDescr = checkNullAndTrim(rs.getString("DESCR")); siteCodeDescr = checkNullAndTrim(rs.getString("DESCR"));
System.out.println("siteCode===["+siteCode+"] siteCodeDescr=======["+siteCodeDescr+"]");
} }
if(rs != null) if(rs != null)
{ {
...@@ -376,7 +383,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -376,7 +383,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
if( currentColumn.trim().equalsIgnoreCase( "itm_default" )) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{ {
valueXmlString.append("<site_code>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>\r\n");
valueXmlString.append("<site_code_descr>").append("<![CDATA["+siteCodeDescr+"]]>").append("</site_code_descr>\r\n"); valueXmlString.append("<site_code_descr>").append("<![CDATA["+siteCodeDescr+"]]>").append("</site_code_descr>\r\n");
valueXmlString.append("<site_code__supp>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code__supp>\r\n"); valueXmlString.append("<site_code__supp>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code__supp>\r\n");
valueXmlString.append("<site_code__supp_descr>").append("<![CDATA["+siteCodeDescr+"]]>").append("</site_code__supp_descr>\r\n"); valueXmlString.append("<site_code__supp_descr>").append("<![CDATA["+siteCodeDescr+"]]>").append("</site_code__supp_descr>\r\n");
...@@ -396,11 +403,11 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -396,11 +403,11 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
break; break;
case 2 : case 2 :
{ {
String contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1)); contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1));
String purcOrder = checkNullAndTrim(genericUtility.getColumnValue("purc_order", dom1)); purcOrder = checkNullAndTrim(genericUtility.getColumnValue("purc_order", dom1));
String suppCode = checkNullAndTrim(genericUtility.getColumnValue("supp_code", dom1)); String suppCode = checkNullAndTrim(genericUtility.getColumnValue("supp_code", dom1));
String suppCodeDescr = checkNullAndTrim(genericUtility.getColumnValue("supp_code_descr", dom1)); String suppCodeDescr = checkNullAndTrim(genericUtility.getColumnValue("supp_code_descr", dom1));
String siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1)); siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1));
siteCodeDescr = checkNullAndTrim(genericUtility.getColumnValue("site_code_descr", dom1)); siteCodeDescr = checkNullAndTrim(genericUtility.getColumnValue("site_code_descr", dom1));
String siteCodeSupp = checkNull(genericUtility.getColumnValue("site_code__supp", dom1)); String siteCodeSupp = checkNull(genericUtility.getColumnValue("site_code__supp", dom1));
String siteCodeSuppDescr= checkNullAndTrim(genericUtility.getColumnValue("site_code__supp_descr", dom1)); String siteCodeSuppDescr= checkNullAndTrim(genericUtility.getColumnValue("site_code__supp_descr", dom1));
...@@ -413,6 +420,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -413,6 +420,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
int domID = 0; int domID = 0;
String itemCode = "", itemDescr = "", unit = "",lineNo = ""; String itemCode = "", itemDescr = "", unit = "",lineNo = "";
double shipperSize = 0, noArtQuot = 0, noArtRem = 0, noArt = 0, quantity = 0 ; double shipperSize = 0, noArtQuot = 0, noArtRem = 0, noArt = 0, quantity = 0 ;
//Date mfgDate = null;
valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n"); valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n");
if(contractNo != null && contractNo.length() > 0) if(contractNo != null && contractNo.length() > 0)
...@@ -443,14 +451,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -443,14 +451,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
/*sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,(D.MAX_QTY - D.QUANTITY_REL) AS QUANTITY,H.TRAN_CODE " /*sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,(D.MAX_QTY - D.QUANTITY_REL) AS QUANTITY,H.TRAN_CODE "
+ " FROM PCONTRACT_HDR H,PCONTRACT_DET D,ITEM I " + " FROM PCONTRACT_HDR H,PCONTRACT_DET D,ITEM I "
+" WHERE H.CONTRACT_NO = D.CONTRACT_NO AND I.ITEM_CODE = D.ITEM_CODE AND H.CONTRACT_NO = ? AND (D.MAX_QTY - D.QUANTITY_REL) > 0 ";*/ +" WHERE H.CONTRACT_NO = D.CONTRACT_NO AND I.ITEM_CODE = D.ITEM_CODE AND H.CONTRACT_NO = ? AND (D.MAX_QTY - D.QUANTITY_REL) > 0 ";*/
sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,D.LINE_NO,D.ITEM_CODE,I.DESCR,I.UNIT,((D.MAX_QTY - D.QUANTITY_REL) - (SELECT COALESCE((SELECT SUM(QUANTITY) " sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,D.LINE_NO,D.ITEM_CODE,I.DESCR,I.UNIT,((D.MAX_QTY - (CASE WHEN D.QUANTITY_REL IS NULL THEN 0 ELSE D.QUANTITY_REL END)) - (SELECT COALESCE((SELECT SUM(QUANTITY) "
+ " FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)) AS QUANTITY," + " FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)) AS QUANTITY,"
+ " H.TRAN_CODE FROM PCONTRACT_HDR H,PCONTRACT_DET D,ITEM I " + " H.TRAN_CODE FROM PCONTRACT_HDR H,PCONTRACT_DET D,ITEM I "
+ " WHERE H.CONTRACT_NO = D.CONTRACT_NO AND I.ITEM_CODE = D.ITEM_CODE AND H.CONTRACT_NO = ? " + " WHERE H.CONTRACT_NO = D.CONTRACT_NO AND I.ITEM_CODE = D.ITEM_CODE AND H.CONTRACT_NO = ? "
+ " AND (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO " + " AND (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO "
+ " AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL) < (D.MAX_QTY - D.QUANTITY_REL) " + " AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL) < (D.MAX_QTY - (CASE WHEN D.QUANTITY_REL IS NULL THEN 0 ELSE D.QUANTITY_REL END)) "
+ " AND (D.MAX_QTY - D.QUANTITY_REL) > 0 "; + " AND (D.MAX_QTY - (CASE WHEN D.QUANTITY_REL IS NULL THEN 0 ELSE D.QUANTITY_REL END)) > 0 ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,contractNo); pstmt.setString(1,contractNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -519,7 +527,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -519,7 +527,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
lotNo = rsShipper.getString("LOT_NO"); lotNo = rsShipper.getString("LOT_NO");
valueXmlString.append("<lot_no>").append("<![CDATA["+lotNo+"]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no>").append("<![CDATA["+lotNo+"]]>").append("</lot_no>\r\n");
} }
String mfgDate = checkNullAndTrim(genericUtility.getColumnValue("mfg_date", dom1));
System.out.println("mfgdate=====["+mfgDate+"]");
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
if(rsShipper != null) if(rsShipper != null)
...@@ -545,10 +554,10 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -545,10 +554,10 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
/*sql = "SELECT H.PURC_ORDER,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,D.QUANTITY,H.TRAN_CODE FROM PORDER H, " /*sql = "SELECT H.PURC_ORDER,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,D.QUANTITY,H.TRAN_CODE FROM PORDER H, "
+ "PORDDET D,ITEM I WHERE H.PURC_ORDER = D.PURC_ORDER AND I.ITEM_CODE = D.ITEM_CODE AND H.PURC_ORDER = ? AND D.QUANTITY > 0 ";*/ + "PORDDET D,ITEM I WHERE H.PURC_ORDER = D.PURC_ORDER AND I.ITEM_CODE = D.ITEM_CODE AND H.PURC_ORDER = ? AND D.QUANTITY > 0 ";*/
sql = "SELECT H.PURC_ORDER,D.LINE_NO,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,(D.QUANTITY - (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD" sql = "SELECT H.PURC_ORDER,D.LINE_NO,H.SUPP_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,(D.QUANTITY - (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD"
+ " WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)) AS QUANTITY,H.TRAN_CODE FROM PORDER H, " + " WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)) AS QUANTITY,H.TRAN_CODE FROM PORDER H, "
+ " PORDDET D,ITEM I WHERE H.PURC_ORDER = D.PURC_ORDER AND I.ITEM_CODE = D.ITEM_CODE AND H.PURC_ORDER = ? " + " PORDDET D,ITEM I WHERE H.PURC_ORDER = D.PURC_ORDER AND I.ITEM_CODE = D.ITEM_CODE AND H.PURC_ORDER = ? "
+ " AND (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL) < D.QUANTITY " + " AND (SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD WHERE AD.TRAN_ID = AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL) < D.QUANTITY "
+ " AND D.QUANTITY > 0 "; + " AND D.QUANTITY > 0 ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder); pstmt.setString(1,purcOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -602,7 +611,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -602,7 +611,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
rsShipper = pstmtShipper.executeQuery(); rsShipper = pstmtShipper.executeQuery();
System.out.println("itemCode["+itemCode+"] quantity["+quantity+"] itemDescr["+itemDescr+"] unit["+unit+"] lineNo["+lineNo+"]"); System.out.println("itemCode["+itemCode+"] quantity["+quantity+"] itemDescr["+itemDescr+"] unit["+unit+"] lineNo["+lineNo+"]");
valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n"); valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n");
valueXmlString.append("<contract_no>").append("<![CDATA["+ purcOrder +"]]>").append("</contract_no>\r\n"); valueXmlString.append("<contract_no>").append("<![CDATA["+ purcOrder +"]]>").append("</contract_no>\r\n");
valueXmlString.append("<supp_code>").append("<![CDATA["+ suppCode +"]]>").append("</supp_code>\r\n"); valueXmlString.append("<supp_code>").append("<![CDATA["+ suppCode +"]]>").append("</supp_code>\r\n");
...@@ -740,7 +749,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -740,7 +749,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
} }
@Override @Override
public String getList(String loginSiteCode, String field, String[] values) throws RemoteException, ITMException public String getList(String field, String[] values, String details, UserInfoBean userInfo) throws RemoteException, ITMException
{ {
String sql = "",scacCode = "",tranType = "",tranName = ""; String sql = "",scacCode = "",tranType = "",tranName = "";
StringBuffer valueXmlString = new StringBuffer("<?xml version = \"1.0\" encoding = \"UTF-8\"?> \r\n <Root>\r\n"); StringBuffer valueXmlString = new StringBuffer("<?xml version = \"1.0\" encoding = \"UTF-8\"?> \r\n <Root>\r\n");
...@@ -750,7 +759,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -750,7 +759,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
Timestamp currDate = null; Timestamp currDate = null;
try try
{ {
String loginCode = genericUtility.getValueFromXTRA_PARAMS( globalXtraParams, "loginCode" ); System.out.println("userInfo["+userInfo+"]");
String loginCode = userInfo.getLoginCode();
String loginSiteCode = userInfo.getSiteCode();
//chgTerm = genericUtility.getValueFromXTRA_PARAMS( globalXtraParams, "chgTerm" ); //chgTerm = genericUtility.getValueFromXTRA_PARAMS( globalXtraParams, "chgTerm" );
System.out.println("Inside getList---->loginSiteCode["+loginSiteCode+"] loginCode["+loginCode+"] Field["+field+"] Values["+values+"]"); System.out.println("Inside getList---->loginSiteCode["+loginSiteCode+"] loginCode["+loginCode+"] Field["+field+"] Values["+values+"]");
...@@ -766,11 +777,11 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -766,11 +777,11 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
+" WHERE H.CONFIRMED = 'Y' AND H.CONTRACT_NO = D.CONTRACT_NO AND S.SUPP_CODE = H.SUPP_CODE " +" WHERE H.CONFIRMED = 'Y' AND H.CONTRACT_NO = D.CONTRACT_NO AND S.SUPP_CODE = H.SUPP_CODE "
+" AND (D.MAX_QTY - D.QUANTITY_REL) > 0 AND " +" AND (D.MAX_QTY - D.QUANTITY_REL) > 0 AND "
+" H.CONTRACT_TODATE >= ? GROUP BY H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME ";*/ +" H.CONTRACT_TODATE >= ? GROUP BY H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME ";*/
sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME FROM PCONTRACT_HDR H,PCONTRACT_DET D,SUPPLIER S " sql = " SELECT H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME FROM PCONTRACT_HDR H,PCONTRACT_DET D,SUPPLIER S "
+" WHERE H.CONFIRMED = 'Y' AND H.CONTRACT_NO = D.CONTRACT_NO AND S.SUPP_CODE = H.SUPP_CODE " +" WHERE H.CONFIRMED = 'Y' AND H.CONTRACT_NO = D.CONTRACT_NO AND S.SUPP_CODE = H.SUPP_CODE "
+" AND (D.MAX_QTY - D.QUANTITY_REL) > 0 AND ((SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD " +" AND (D.MAX_QTY - (CASE WHEN D.QUANTITY_REL IS NULL THEN 0 ELSE D.QUANTITY_REL END)) > 0 AND ((SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD "
+" WHERE AD.TRAN_ID=AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)< (D.MAX_QTY - D.QUANTITY_REL) )" +" WHERE AD.TRAN_ID=AH.TRAN_ID AND AH.CONTRACT_NO = H.CONTRACT_NO AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)< (D.MAX_QTY - (CASE WHEN D.QUANTITY_REL IS NULL THEN 0 ELSE D.QUANTITY_REL END)) )"
+" AND H.STATUS = ? AND H.CONTRACT_TODATE >= ? " +" AND H.STATUS = ? AND H.CONTRACT_TODATE >= ? "
+" AND S.SITE_CODE = ? AND S.SUPP_CODE = ?" +" AND S.SITE_CODE = ? AND S.SUPP_CODE = ?"
+" GROUP BY H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME "; +" GROUP BY H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME ";
...@@ -784,7 +795,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -784,7 +795,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
/*sql = " SELECT H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME FROM PORDER H,PORDDET D,SUPPLIER S WHERE H.CONFIRMED = 'Y' " + /*sql = " SELECT H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME FROM PORDER H,PORDDET D,SUPPLIER S WHERE H.CONFIRMED = 'Y' " +
"AND H.PURC_ORDER = D.PURC_ORDER AND S.SUPP_CODE = H.SUPP_CODE AND D.QUANTITY > 0 AND H.ORD_DATE >= ? " + "AND H.PURC_ORDER = D.PURC_ORDER AND S.SUPP_CODE = H.SUPP_CODE AND D.QUANTITY > 0 AND H.ORD_DATE >= ? " +
"GROUP BY H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME ";*/ "GROUP BY H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME ";*/
sql = "SELECT H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME FROM PORDER H,PORDDET D,SUPPLIER S WHERE H.CONFIRMED = 'Y' " + sql = "SELECT H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME FROM PORDER H,PORDDET D,SUPPLIER S WHERE H.CONFIRMED = 'Y' " +
"AND H.PURC_ORDER = D.PURC_ORDER AND S.SUPP_CODE = H.SUPP_CODE AND D.QUANTITY > 0 AND ((SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD " + "AND H.PURC_ORDER = D.PURC_ORDER AND S.SUPP_CODE = H.SUPP_CODE AND D.QUANTITY > 0 AND ((SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD " +
"WHERE AD.TRAN_ID=AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)< D.QUANTITY ) " + "WHERE AD.TRAN_ID=AH.TRAN_ID AND AH.PURC_ORDER = H.PURC_ORDER AND AD.ITEM_CODE = D.ITEM_CODE) ,0) FROM DUAL)< D.QUANTITY ) " +
...@@ -867,6 +878,41 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -867,6 +878,41 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
valueXmlString.append("</List>\r\n"); valueXmlString.append("</List>\r\n");
num++; num++;
} }
if(details.length() > 0)
{
Document dom = genericUtility.parseString(details);
Node currDetail = null;
NodeList detail1List = null;
NodeList currDetail1List = null;
Node childNode = null;
detail1List = dom.getElementsByTagName("Headers");
for ( int ctr1 = 0; ctr1 < detail1List.getLength(); ctr1++ )
{
valueXmlString.append("<Headers domID='" + ctr1 + "' selected = 'N' >\r\n");
currDetail = detail1List.item(ctr1);
currDetail1List = currDetail.getChildNodes();
for ( int i=0; i< currDetail1List.getLength(); i++ )
{
childNode = currDetail1List.item(i);
String nodeName = childNode.getNodeName();
String nodeValue = "";
if ( childNode != null && childNode.getFirstChild() != null )
{
nodeValue = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
if (nodeName.equalsIgnoreCase("headName"))
{
valueXmlString.append("<headName><![CDATA[").append(nodeValue).append("]]></headName>\r\n");
}
if (nodeName.equalsIgnoreCase("headSize"))
{
valueXmlString.append("<headSize><![CDATA[").append(nodeValue).append("]]></headSize>\r\n");
}
}
valueXmlString.append("</Headers>\r\n");
}
}
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -1069,9 +1115,6 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -1069,9 +1115,6 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
if(rs.next()) if(rs.next())
{ {
System.out.println("===RECORD ALREADY EXIST========"); System.out.println("===RECORD ALREADY EXIST========");
//return getError(" ", "VTCASLBL", tempConn);
// errCode = "VTCASLBL";
// errString= new ITMDBAccessEJB().getErrorString("",errCode,"","",tempConn);
if(rs != null) if(rs != null)
{ {
rs.close();rs = null; rs.close();rs = null;
...@@ -1142,6 +1185,131 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -1142,6 +1185,131 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
return errString; return errString;
} }
public String calcExpDate(String mfgDate, String itemCode) throws RemoteException, ITMException
{
double minSelfLife = 0.0;
String sql = "", expDate = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
Connection tempConn = getConnection();
DistCommon distComm = new DistCommon();
java.sql.Timestamp expDateCalc = null, mfgDateTs = null;
try
{
sql = "SELECT MIN_SHELF_LIFE FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = tempConn.prepareStatement(sql);
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if ( rs.next() )
{
minSelfLife = rs.getDouble("MIN_SHELF_LIFE");
}
pstmt.clearParameters();
System.out.println("minSelfLife["+minSelfLife+"] ");
mfgDateTs = Timestamp.valueOf(genericUtility.getValidDateString(mfgDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
expDateCalc = distComm.CalcExpiry( mfgDateTs, minSelfLife );
System.out.println("expDateCalc["+expDateCalc+"] ");
expDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(expDateCalc);
System.out.println("expDate["+expDate+"] ");
pstmt.close(); pstmt = null;
rs.close(); rs = null;
}
catch(Exception e)
{
System.out.println("errorrrrrrrrrrrrrrrrrrrrrrrr");
e.printStackTrace();
}
return expDate;
}
public String compDate(String mfgDate,String expDate) throws RemoteException, ITMException
{
String compareDate = "";
java.sql.Timestamp mfgDateTs = null;
java.sql.Timestamp expDateTs = null;
try
{
mfgDateTs = Timestamp.valueOf(genericUtility.getValidDateString(mfgDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
expDateTs = Timestamp.valueOf(genericUtility.getValidDateString(expDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(genericUtility.getDBDateFormat());
if (mfgDateTs.compareTo(expDateTs) > 0)
{
compareDate = "1";
}
else
{
compareDate = "0";
}
}
catch(Exception e)
{
System.out.println("errorrrrrrrrrrrrrrrrrrrrrrrr");
e.printStackTrace();
}
return compareDate;
}
public String getSiteCode(String purcOrder, String contractNo) throws RemoteException, ITMException
{
String sql = "", siteCode = "", siteCodeLcns = "", siteCodeDlv = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
Connection tempConn = getConnection();
java.sql.Timestamp expDateCalc = null, mfgDateTs = null;
try
{
sql = "SELECT SITE_CODE__LICENSE FROM PCONTRACT_HDR WHERE CONTRACT_NO = ?";
pstmt = tempConn.prepareStatement(sql);
pstmt.setString(1,contractNo);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeLcns = checkNullAndTrim(rs.getString("SITE_CODE__LICENSE"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
sql = "SELECT SITE_CODE__DLV FROM PORDER WHERE PURC_ORDER = ?";
pstmt = tempConn.prepareStatement(sql);
pstmt.setString(1,purcOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeDlv = checkNullAndTrim(rs.getString("SITE_CODE__DLV"));
System.out.println("siteCodeDlv===["+siteCodeDlv+"]");
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
if(siteCodeLcns != null && siteCodeLcns.trim().length() > 0)
{
//siteCode = siteCodeLcns;
siteCode = "";
}
else
{
siteCode = siteCodeDlv;
}
System.out.println("siteCode["+siteCode+"]");
}
catch(Exception e)
{
System.out.println("errorrrrrrrrrrrrrrrrrrrrrrrr");
e.printStackTrace();
}
return siteCode;
}
//Changed by manish on 07/10/16[end] //Changed by manish on 07/10/16[end]
} }
webitm-wms/ibase/webitm/ejb/wms/PackLabelWizEJBLocal.java
View file @ 46749bb6
package ibase.webitm.ejb.wms; package ibase.webitm.ejb.wms;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ValidatorLocal; import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -16,7 +17,9 @@ public interface PackLabelWizEJBLocal extends ValidatorLocal ...@@ -16,7 +17,9 @@ public interface PackLabelWizEJBLocal extends ValidatorLocal
public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException; public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException; public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException; public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String loginCode, String field, String[] values) throws RemoteException,ITMException; public String getList(String field, String[] values, String details, UserInfoBean userInfo) throws RemoteException,ITMException;
public String insertCaseLabel(String itemCode1, String lotNo1, String qty, public String insertCaseLabel(String itemCode1, String lotNo1, String qty,String ordNo) throws RemoteException,ITMException ;
String ordNo) throws RemoteException,ITMException ; public String calcExpDate(String mfgDate, String itemCode) throws RemoteException, ITMException;
public String getSiteCode(String purcOrder, String contractNo) throws RemoteException, ITMException;
public String compDate(String mfgDate,String expDate) throws RemoteException, ITMException;
} }
webitm-wms/ibase/webitm/ejb/wms/PackLabelWizEJBRemote.java
View file @ 46749bb6
package ibase.webitm.ejb.wms; package ibase.webitm.ejb.wms;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ValidatorRemote; import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -16,7 +17,9 @@ public interface PackLabelWizEJBRemote extends ValidatorRemote ...@@ -16,7 +17,9 @@ public interface PackLabelWizEJBRemote extends ValidatorRemote
public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException; public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException; public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException; public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String loginCode, String field, String[] values) throws RemoteException,ITMException; public String getList(String field, String[] values, String details, UserInfoBean userInfo) throws RemoteException,ITMException;
public String insertCaseLabel(String itemCode1, String lotNo1, String qty, public String insertCaseLabel(String itemCode1, String lotNo1, String qty,String ordNo) throws RemoteException,ITMException ;
String ordNo) throws RemoteException,ITMException ; public String calcExpDate(String mfgDate, String itemCode) throws RemoteException, ITMException;
public String getSiteCode(String purcOrder, String contractNo) throws RemoteException, ITMException;
public String compDate(String mfgDate,String expDate) throws RemoteException, ITMException;
} }
webitm-wms/ibase/webitm/ejb/wms/PackLabelWizPosEJB.java
View file @ 46749bb6
...@@ -147,7 +147,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -147,7 +147,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
scacCode = checkNullAndTrim(childNode.getFirstChild().getNodeValue()); scacCode = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
} }
} }
System.out.println("site_code is ===["+siteCode+"]");
StringBuffer xmlString = new StringBuffer(); StringBuffer xmlString = new StringBuffer();
StringBuffer xmlStringHdr= new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); StringBuffer xmlStringHdr= new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
xmlStringHdr.append("<DocumentRoot><description>Datawindow Root</description><group0><description>Group0 escription</description>"); xmlStringHdr.append("<DocumentRoot><description>Datawindow Root</description><group0><description>Group0 escription</description>");
...@@ -170,6 +170,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -170,6 +170,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
xmlStringHdr.append("<attribute pkNames=\"tran_id:\" status=\"N\" updateFlag=\"A\" selected=\"N\" />"); xmlStringHdr.append("<attribute pkNames=\"tran_id:\" status=\"N\" updateFlag=\"A\" selected=\"N\" />");
xmlStringHdr.append("<asn_no><![CDATA[").append(asnNo).append("]]></asn_no>"); xmlStringHdr.append("<asn_no><![CDATA[").append(asnNo).append("]]></asn_no>");
xmlStringHdr.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>");
xmlStringHdr.append("<tran_id><![CDATA[").append("").append("]]></tran_id>"); xmlStringHdr.append("<tran_id><![CDATA[").append("").append("]]></tran_id>");
xmlStringHdr.append("<tran_date><![CDATA[").append(currDate).append("]]></tran_date>"); xmlStringHdr.append("<tran_date><![CDATA[").append(currDate).append("]]></tran_date>");
xmlStringHdr.append("<asn_date><![CDATA[").append(currDate).append("]]></asn_date>"); xmlStringHdr.append("<asn_date><![CDATA[").append(currDate).append("]]></asn_date>");
...@@ -318,7 +319,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -318,7 +319,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
catch(Exception e) catch(Exception e)
{ {
isError = true; isError = true;
asnNo = ""; //asnNo = "";
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
...@@ -328,7 +329,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -328,7 +329,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
{ {
if(isError) if(isError)
{ {
asnNo = ""; //asnNo = "";
conn.rollback(); conn.rollback();
} }
else else
......
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