Skip to content

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

Change by Manish for RVB2B on 28/10/16 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103835 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0db3cb2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 617 additions and 363 deletions
webitm-wms/ibase/webitm/ejb/wms/PackLabelWizPosEJB.java
View file @ 04930112
...@@ -92,7 +92,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -92,7 +92,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
int lineNo = 0; int lineNo = 0;
Document dom = null; Document dom = null;
String contractNo = "",purcOrder = "",suppCode = "",siteCode = "",userId = "",tranCode = "", tranType = "",scacCode = ""; String contractNo = "",purcOrder = "",suppCode = "",siteCode = "",userId = "",loginSiteCode = "",tranCode = "", tranType = "",scacCode = "",lineNoOrd = "";
try try
{ {
...@@ -105,7 +105,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -105,7 +105,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
asnNo = "ASN" + GetRandomNumber(); asnNo = "ASN" + GetRandomNumber();
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
//loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
Node detail1Node = dom.getElementsByTagName("Detail1").item(0); Node detail1Node = dom.getElementsByTagName("Detail1").item(0);
NodeList detail1List = detail1Node.getChildNodes(); NodeList detail1List = detail1Node.getChildNodes();
int detail1ListLen = detail1List.getLength(); int detail1ListLen = detail1List.getLength();
...@@ -132,7 +132,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -132,7 +132,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
} }
else if(childNode != null && "site_code".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null) else if(childNode != null && "site_code".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{ {
siteCode = checkNullAndTrim(childNode.getFirstChild().getNodeValue()); siteCode = checkNull(childNode.getFirstChild().getNodeValue());
} }
else if(childNode != null && "tran_code".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null) else if(childNode != null && "tran_code".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{ {
...@@ -236,7 +236,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -236,7 +236,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
} }
else if(childNode != null && "site_code__mfg".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null) else if(childNode != null && "site_code__mfg".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{ {
mfgSite= checkNullAndTrim(childNode.getFirstChild().getNodeValue()); mfgSite= checkNull(childNode.getFirstChild().getNodeValue());
}
else if(childNode != null && "line_no__ord".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
lineNoOrd= checkNull(childNode.getFirstChild().getNodeValue());
System.out.println("lineNoOrd is ===["+lineNoOrd+"]");
} }
} }
domID++; domID++;
...@@ -258,6 +263,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -258,6 +263,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
xmlStringDet.append("<attribute pkNames='tran_id:line_no:' status='N' updateFlag='A' selected='N'/>"); xmlStringDet.append("<attribute pkNames='tran_id:line_no:' status='N' updateFlag='A' selected='N'/>");
xmlStringDet.append("<line_no><![CDATA[").append(domID).append("]]></line_no>"); xmlStringDet.append("<line_no><![CDATA[").append(domID).append("]]></line_no>");
xmlStringDet.append("<line_no__ord><![CDATA[").append(lineNoOrd).append("]]></line_no__ord>");
xmlStringDet.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>"); xmlStringDet.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>");
xmlStringDet.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>"); xmlStringDet.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>");
xmlStringDet.append("<lot_no><![CDATA[").append(lotNo).append("]]></lot_no>"); xmlStringDet.append("<lot_no><![CDATA[").append(lotNo).append("]]></lot_no>");
...@@ -265,6 +271,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -265,6 +271,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
xmlStringDet.append("<exp_date><![CDATA[").append(expDate).append("]]></exp_date>"); xmlStringDet.append("<exp_date><![CDATA[").append(expDate).append("]]></exp_date>");
xmlStringDet.append("<mfg_date><![CDATA[").append(mfgDate).append("]]></mfg_date>"); xmlStringDet.append("<mfg_date><![CDATA[").append(mfgDate).append("]]></mfg_date>");
xmlStringDet.append("<site_code__mfg><![CDATA[").append(mfgSite).append("]]></site_code__mfg>"); xmlStringDet.append("<site_code__mfg><![CDATA[").append(mfgSite).append("]]></site_code__mfg>");
xmlStringDet.append("<no_pallet><![CDATA[1]]></no_pallet>");
xmlStringDet.append("</Detail2>"); xmlStringDet.append("</Detail2>");
...@@ -347,6 +354,15 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -347,6 +354,15 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
return retString; return retString;
} }
private static String checkNull(String input)
{
if (input==null)
{
input="";
}
return input;
}
private static String checkNullAndTrim(String input) private static String checkNullAndTrim(String input)
{ {
if (input==null) if (input==null)
...@@ -829,8 +845,8 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -829,8 +845,8 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
grossWeight = rs.getDouble("GROSS_WEIGHT"); grossWeight = rs.getDouble("GROSS_WEIGHT");
netWeight = rs.getDouble("NET_WEIGHT"); netWeight = rs.getDouble("NET_WEIGHT");
shelfLife = checkNullAndTrim(rs.getString("SHELF_LIFE")); shelfLife = checkNullAndTrim(rs.getString("SHELF_LIFE"));
siteCodeMfg = checkNullAndTrim(rs.getString("SITE_CODE__MFG")); siteCodeMfg = checkNull(rs.getString("SITE_CODE__MFG"));
siteCodeOwn = checkNullAndTrim(rs.getString("SITE_CODE__OWN")); siteCodeOwn = checkNull(rs.getString("SITE_CODE__OWN"));
innerShipperSize = rs.getDouble("INNER_SHIPPER_SIZE"); innerShipperSize = rs.getDouble("INNER_SHIPPER_SIZE");
unitInnerLabel = checkNullAndTrim(rs.getString("UNIT__INNER_LABEL")); unitInnerLabel = checkNullAndTrim(rs.getString("UNIT__INNER_LABEL"));
duplexSize = rs.getDouble("DUPLEX_SIZE"); duplexSize = rs.getDouble("DUPLEX_SIZE");
...@@ -941,7 +957,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -941,7 +957,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
grossWeight = rs.getDouble("GROSS_WEIGHT"); grossWeight = rs.getDouble("GROSS_WEIGHT");
netWeight = rs.getDouble("NET_WEIGHT"); netWeight = rs.getDouble("NET_WEIGHT");
shelfLife = checkNullAndTrim(rs.getString("SHELF_LIFE")); shelfLife = checkNullAndTrim(rs.getString("SHELF_LIFE"));
siteCodeOwn = checkNullAndTrim(rs.getString("SITE_CODE__OWN")); siteCodeOwn = checkNull(rs.getString("SITE_CODE__OWN"));
shipperlength = rs.getDouble("LENGTH"); shipperlength = rs.getDouble("LENGTH");
width = rs.getDouble("WIDTH"); width = rs.getDouble("WIDTH");
height = rs.getDouble("HEIGHT"); height = rs.getDouble("HEIGHT");
...@@ -1286,9 +1302,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1286,9 +1302,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
String tranId = ""; String tranId = "";
Date mfgDate = null; Date mfgDate = null;
Date expDate = null; Date expDate = null;
Date asnDate = null;
String mfgDateStr = ""; String mfgDateStr = "";
String expDateStr = ""; String expDateStr = "";
String asnDateStr = "";
String mfgSite = ""; String mfgSite = "";
String packSize = "";
StringBuffer details = new StringBuffer("<root>"); StringBuffer details = new StringBuffer("<root>");
...@@ -1298,7 +1317,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1298,7 +1317,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
System.out.println("ASN No=======["+asnNo+"]"); System.out.println("ASN No=======["+asnNo+"]");
sql = "SELECT TRAN_ID,PURC_ORDER,CONTRACT_NO,SUPP_CODE FROM ASN_HDR WHERE ASN_NO = ?"; sql = "SELECT TRAN_ID,PURC_ORDER,CONTRACT_NO,SUPP_CODE,ASN_DATE FROM ASN_HDR WHERE ASN_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,asnNo); pstmt.setString(1,asnNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1309,6 +1328,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1309,6 +1328,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
purcOrder = checkNullAndTrim(rs.getString("PURC_ORDER")); purcOrder = checkNullAndTrim(rs.getString("PURC_ORDER"));
contractNo = checkNullAndTrim(rs.getString("CONTRACT_NO")); contractNo = checkNullAndTrim(rs.getString("CONTRACT_NO"));
suppCode = checkNullAndTrim(rs.getString("SUPP_CODE")); suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
asnDate = rs.getDate("ASN_DATE");
} }
rs.close();rs = null; rs.close();rs = null;
...@@ -1336,10 +1356,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1336,10 +1356,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
details.append("<asn_no><![CDATA[").append(asnNo).append("]]></asn_no>\r\n"); details.append("<asn_no><![CDATA[").append(asnNo).append("]]></asn_no>\r\n");
details.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>\r\n"); details.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>\r\n");
details.append("<supp_name><![CDATA[").append(suppName).append("]]></supp_name>\r\n"); details.append("<supp_name><![CDATA[").append(suppName).append("]]></supp_name>\r\n");
asnDateStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(asnDate);
details.append("<ship_date><![CDATA[").append(asnDateStr).append("]]></ship_date>\r\n");
details.append("</finish>"); details.append("</finish>");
sql = "SELECT ITEM_CODE,QUANTITY,MFG_DATE,EXP_DATE,SITE_CODE__MFG FROM ASN_DET WHERE TRAN_ID = ? "; sql = "SELECT ITEM_CODE,QUANTITY,MFG_DATE,EXP_DATE,SITE_CODE__MFG,PACK_SIZE FROM ASN_DET WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1351,11 +1373,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1351,11 +1373,12 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
quantity = checkNullAndTrim(rs.getString("QUANTITY")); quantity = checkNullAndTrim(rs.getString("QUANTITY"));
mfgDate = rs.getDate("MFG_DATE"); mfgDate = rs.getDate("MFG_DATE");
expDate = rs.getDate("EXP_DATE"); expDate = rs.getDate("EXP_DATE");
mfgSite = checkNullAndTrim(rs.getString("SITE_CODE__MFG")); mfgSite = checkNull(rs.getString("SITE_CODE__MFG"));
packSize = checkNullAndTrim(rs.getString("PACK_SIZE"));
mfgDateStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(mfgDate); mfgDateStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(mfgDate);
expDateStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(expDate); expDateStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(expDate);
System.out.println("===mfgDateStr==["+mfgDateStr+"] expDateStr====["+expDateStr+"]"); System.out.println("===mfgDateStr==["+mfgDateStr+"] expDateStr====["+expDateStr+"] mfgSite=====["+mfgSite+"]");
domID++; domID++;
...@@ -1365,6 +1388,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE ...@@ -1365,6 +1388,7 @@ public class PackLabelWizPosEJB extends ValidatorEJB implements PackLabelWizPosE
details.append("<mfg_date><![CDATA[").append(mfgDateStr).append("]]></mfg_date>\r\n"); details.append("<mfg_date><![CDATA[").append(mfgDateStr).append("]]></mfg_date>\r\n");
details.append("<exp_date><![CDATA[").append(expDateStr).append("]]></exp_date>\r\n"); details.append("<exp_date><![CDATA[").append(expDateStr).append("]]></exp_date>\r\n");
details.append("<site_code__mfg><![CDATA[").append(mfgSite).append("]]></site_code__mfg>\r\n"); details.append("<site_code__mfg><![CDATA[").append(mfgSite).append("]]></site_code__mfg>\r\n");
details.append("<pack_size><![CDATA[").append(packSize).append("]]></pack_size>\r\n");
details.append("</extra>"); details.append("</extra>");
......
webitm-wms/module-resource/web/xsl/WIZARD/packLabelWiz_Finish_wiz_en_US.xsl
View file @ 04930112
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<xsl:template match="/"> <xsl:template match="/">
<html> <html>
<link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet"/> <link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet" />
<link rel="stylesheet" href="/ibase/webitm/css/DD/default.css" type="text/css" /> <link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet" />
<link id="userThemeLink" type="text/css" rel="stylesheet" href=""/> <link href="/ibase/webitm/css/Standard/default.css" rel="stylesheet" />
<script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script> <script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script>
<body onload="setUserTheme()"> <body onload="setUserTheme()">
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<table class="tableClass" id="Details1" border="0" cellspacing="1" cellpadding="1"> <table class="tableClass" id="Details1" border="0" cellspacing="1" cellpadding="1">
<thead class="table-head" style="text-align:center;"> <thead class="table-head" style="text-align:center;">
<tr> <tr>
<th class="thClass" nowrap="true" valign="bottom" >
<strong>ASN Number</strong>
</th>
<th class="thClass" nowrap="true" valign="bottom" > <th class="thClass" nowrap="true" valign="bottom" >
<strong>Contract Number</strong> <strong>Contract Number</strong>
</th> </th>
...@@ -28,22 +31,26 @@ ...@@ -28,22 +31,26 @@
</th> </th>
<th class="thClass" nowrap="true" valign="bottom" > <th class="thClass" nowrap="true" valign="bottom" >
<strong>Supplier Name</strong> <strong>Supplier Name</strong>
</th> </th>
<th class="thClass" nowrap="true" valign="bottom" > <th class="thClass" nowrap="true" valign="bottom" >
<strong>ASN Number</strong> <strong>Shipment Date</strong>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody class="table-body"> <tbody class="table-body">
<xsl:for-each select="//finish"> <xsl:for-each select="//finish">
<xsl:variable name="asn_no"><xsl:value-of select="asn_no"/></xsl:variable>
<xsl:variable name="contract_no"><xsl:value-of select="contract_no"/></xsl:variable> <xsl:variable name="contract_no"><xsl:value-of select="contract_no"/></xsl:variable>
<xsl:variable name="purc_order"><xsl:value-of select="purc_order"/></xsl:variable> <xsl:variable name="purc_order"><xsl:value-of select="purc_order"/></xsl:variable>
<xsl:variable name="supp_code"><xsl:value-of select="supp_code"/></xsl:variable> <xsl:variable name="supp_code"><xsl:value-of select="supp_code"/></xsl:variable>
<xsl:variable name="supp_name"><xsl:value-of select="supp_name"/></xsl:variable> <xsl:variable name="supp_name"><xsl:value-of select="supp_name"/></xsl:variable>
<xsl:variable name="asn_no"><xsl:value-of select="asn_no"/></xsl:variable> <xsl:variable name="ship_date"><xsl:value-of select="ship_date"/></xsl:variable>
<tr style="text-align:center;"> <tr style="text-align:center;">
<td>
<xsl:value-of select="asn_no"/>
</td>
<td> <td>
<xsl:value-of select="contract_no"/> <xsl:value-of select="contract_no"/>
</td> </td>
...@@ -55,11 +62,10 @@ ...@@ -55,11 +62,10 @@
</td> </td>
<td> <td>
<xsl:value-of select="supp_name"/> <xsl:value-of select="supp_name"/>
</td> </td>
<td> <td>
<xsl:value-of select="asn_no"/> <xsl:value-of select="ship_date"/>
</td> </td>
</tr> </tr>
</xsl:for-each> </xsl:for-each>
</tbody> </tbody>
...@@ -84,6 +90,9 @@ ...@@ -84,6 +90,9 @@
<th class="thClass" nowrap="true" valign="bottom" > <th class="thClass" nowrap="true" valign="bottom" >
<strong>Mfg Site</strong> <strong>Mfg Site</strong>
</th> </th>
<th class="thClass" nowrap="true" valign="bottom" >
<strong>Pack Size</strong>
</th>
</tr> </tr>
</thead> </thead>
...@@ -95,6 +104,7 @@ ...@@ -95,6 +104,7 @@
<xsl:variable name="mfg_date"><xsl:value-of select="mfg_date"/></xsl:variable> <xsl:variable name="mfg_date"><xsl:value-of select="mfg_date"/></xsl:variable>
<xsl:variable name="exp_date"><xsl:value-of select="exp_date"/></xsl:variable> <xsl:variable name="exp_date"><xsl:value-of select="exp_date"/></xsl:variable>
<xsl:variable name="site_code__mfg"><xsl:value-of select="site_code__mfg"/></xsl:variable> <xsl:variable name="site_code__mfg"><xsl:value-of select="site_code__mfg"/></xsl:variable>
<xsl:variable name="pack_size"><xsl:value-of select="pack_size"/></xsl:variable>
<tr style="text-align:center;"> <tr style="text-align:center;">
<td> <td>
...@@ -112,6 +122,9 @@ ...@@ -112,6 +122,9 @@
<td> <td>
<xsl:value-of select="site_code__mfg"/> <xsl:value-of select="site_code__mfg"/>
</td> </td>
<td>
<xsl:value-of select="pack_size"/>
</td>
</tr> </tr>
</xsl:for-each> </xsl:for-each>
......
webitm-wms/module-resource/web/xsl/WIZARD/packLabelWiz_List_wiz_en_US.xsl
View file @ 04930112
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script> <script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/asnWizardPopup.js"></script> <script type="text/javascript" src="/ibase/webitm/js/asnWizardPopup.js"></script>
<link rel="stylesheet" href="/ibase/webitm/css/DD/default.css" type="text/css" /> <link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet" />
<link id="userThemeLink" type="text/css" rel="stylesheet" href=""/> <link href="/ibase/webitm/css/Standard/default.css" rel="stylesheet" />
<link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet" />
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<![CDATA[ <![CDATA[
......
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