Commit 04930112 authored by msingh's avatar msingh

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
...@@ -30,6 +30,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -30,6 +30,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.
*/ */
...@@ -377,8 +378,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -377,8 +378,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
{ {
valueXmlString.append("<site_code>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code>").append("<![CDATA["+loginSiteCode+"]]>").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[]]>").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[]]>").append("</site_code__supp_descr>\r\n"); valueXmlString.append("<site_code__supp_descr>").append("<![CDATA["+siteCodeDescr+"]]>").append("</site_code__supp_descr>\r\n");
valueXmlString.append("<contract_no>").append("<![CDATA[]]>").append("</contract_no>\r\n"); valueXmlString.append("<contract_no>").append("<![CDATA[]]>").append("</contract_no>\r\n");
valueXmlString.append("<purc_order>").append("<![CDATA[]]>").append("</purc_order>\r\n"); valueXmlString.append("<purc_order>").append("<![CDATA[]]>").append("</purc_order>\r\n");
valueXmlString.append("<supp_code>").append("<![CDATA[]]>").append("</supp_code>\r\n"); valueXmlString.append("<supp_code>").append("<![CDATA[]]>").append("</supp_code>\r\n");
...@@ -399,9 +400,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -399,9 +400,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
String purcOrder = checkNullAndTrim(genericUtility.getColumnValue("purc_order", dom1)); String 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 = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom1)); String 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 = checkNullAndTrim(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));
String tranCode = checkNullAndTrim(genericUtility.getColumnValue("tran_code", dom1)); String tranCode = checkNullAndTrim(genericUtility.getColumnValue("tran_code", dom1));
String tranName = checkNullAndTrim(genericUtility.getColumnValue("tran_name", dom1)); String tranName = checkNullAndTrim(genericUtility.getColumnValue("tran_name", dom1));
...@@ -410,7 +411,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -410,7 +411,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
String shipDate = checkNullAndTrim(genericUtility.getColumnValue("ship_date", dom1)); String shipDate = checkNullAndTrim(genericUtility.getColumnValue("ship_date", dom1));
int domID = 0; int domID = 0;
String itemCode = "", itemDescr = "", unit = ""; 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 ;
valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n"); valueXmlString.append("<Detail2 domID = '"+domID+"' selected = 'N'>\r\n");
...@@ -443,7 +444,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -443,7 +444,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
+ " 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.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 - D.QUANTITY_REL) - (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 = ? "
...@@ -457,6 +458,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -457,6 +458,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
{ {
domID++; domID++;
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
lineNo = checkNull(rs.getString("LINE_NO"));
quantity = rs.getDouble("QUANTITY"); quantity = rs.getDouble("QUANTITY");
itemDescr = checkNullAndTrim(rs.getString("DESCR")); itemDescr = checkNullAndTrim(rs.getString("DESCR"));
unit = checkNullAndTrim(rs.getString("UNIT")); unit = checkNullAndTrim(rs.getString("UNIT"));
...@@ -499,7 +501,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -499,7 +501,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
pstmtShipper.setString(1,itemCode); pstmtShipper.setString(1,itemCode);
rsShipper = pstmtShipper.executeQuery(); rsShipper = pstmtShipper.executeQuery();
System.out.println("itemCode["+itemCode+"] quantity["+quantity+"] itemDescr["+itemDescr+"] unit["+unit+"]"); 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["+ contractNo +"]]>").append("</contract_no>\r\n"); valueXmlString.append("<contract_no>").append("<![CDATA["+ contractNo +"]]>").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");
...@@ -510,7 +512,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -510,7 +512,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>\r\n");
valueXmlString.append("<shipper_size>").append("<![CDATA["+shipperSize+"]]>").append("</shipper_size>\r\n"); valueXmlString.append("<shipper_size>").append("<![CDATA["+shipperSize+"]]>").append("</shipper_size>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA["+noArt+"]]>").append("</no_art>\r\n"); valueXmlString.append("<no_art>").append("<![CDATA["+noArt+"]]>").append("</no_art>\r\n");
valueXmlString.append("<site_code__mfg>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<line_no__ord>").append("<![CDATA["+lineNo+"]]>").append("</line_no__ord>\r\n");
if(rsShipper.next()) if(rsShipper.next())
{ {
lotNo = rsShipper.getString("LOT_NO"); lotNo = rsShipper.getString("LOT_NO");
...@@ -541,7 +544,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -541,7 +544,7 @@ 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,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 "
...@@ -553,6 +556,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -553,6 +556,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
{ {
domID++; domID++;
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
lineNo = checkNull(rs.getString("LINE_NO"));
quantity = rs.getDouble("QUANTITY"); quantity = rs.getDouble("QUANTITY");
itemDescr = checkNullAndTrim(rs.getString("DESCR")); itemDescr = checkNullAndTrim(rs.getString("DESCR"));
unit = checkNullAndTrim(rs.getString("UNIT")); unit = checkNullAndTrim(rs.getString("UNIT"));
...@@ -597,7 +601,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -597,7 +601,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
pstmtShipper.setString(1,itemCode); pstmtShipper.setString(1,itemCode);
rsShipper = pstmtShipper.executeQuery(); rsShipper = pstmtShipper.executeQuery();
System.out.println("itemCode["+itemCode+"] quantity["+quantity+"] itemDescr["+itemDescr+"] unit["+unit+"]"); 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");
...@@ -609,6 +613,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -609,6 +613,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>\r\n");
valueXmlString.append("<shipper_size>").append("<![CDATA["+shipperSize+"]]>").append("</shipper_size>\r\n"); valueXmlString.append("<shipper_size>").append("<![CDATA["+shipperSize+"]]>").append("</shipper_size>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA["+noArt+"]]>").append("</no_art>\r\n"); valueXmlString.append("<no_art>").append("<![CDATA["+noArt+"]]>").append("</no_art>\r\n");
valueXmlString.append("<site_code__mfg>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<line_no__ord>").append("<![CDATA["+lineNo+"]]>").append("</line_no__ord>\r\n");
if(rsShipper.next()) if(rsShipper.next())
{ {
lotNo = rsShipper.getString("LOT_NO"); lotNo = rsShipper.getString("LOT_NO");
...@@ -734,7 +740,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -734,7 +740,7 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
} }
@Override @Override
public String getList(String loginCode, String field, String[] values) throws RemoteException, ITMException public String getList(String loginSiteCode, String field, String[] values) 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");
...@@ -744,7 +750,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -744,7 +750,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
Timestamp currDate = null; Timestamp currDate = null;
try try
{ {
System.out.println("Inside getList---->loginCode["+loginCode+"] Field["+field+"] Values["+values+"]"); String loginCode = genericUtility.getValueFromXTRA_PARAMS( globalXtraParams, "loginCode" );
//chgTerm = genericUtility.getValueFromXTRA_PARAMS( globalXtraParams, "chgTerm" );
System.out.println("Inside getList---->loginSiteCode["+loginSiteCode+"] loginCode["+loginCode+"] Field["+field+"] Values["+values+"]");
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
...@@ -763,7 +771,9 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -763,7 +771,9 @@ 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 ((SELECT COALESCE((SELECT SUM(QUANTITY) FROM ASN_HDR AH, ASN_DET AD " +" AND (D.MAX_QTY - D.QUANTITY_REL) > 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 - D.QUANTITY_REL) )"
+" AND H.STATUS = ? AND H.CONTRACT_TODATE >= ? GROUP BY H.CONTRACT_NO,H.SUPP_CODE,H.TRAN_CODE,H.SITE_CODE__SUPP,S.SUPP_NAME "; +" AND H.STATUS = ? AND H.CONTRACT_TODATE >= ? "
+" 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 ";
} }
else if(field.equals("site_code")) else if(field.equals("site_code"))
{ {
...@@ -778,7 +788,8 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -778,7 +788,8 @@ 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 ((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 ) " +
"AND H.STATUS = ? GROUP BY H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME "; " AND H.STATUS = ? AND S.SITE_CODE = ? AND S.SUPP_CODE = ?" +
" GROUP BY H.PURC_ORDER,H.SUPP_CODE,H.TRAN_CODE,S.SITE_CODE,S.SUPP_NAME ";
} }
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -786,10 +797,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -786,10 +797,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
{ {
pstmt.setString(1, "O"); pstmt.setString(1, "O");
pstmt.setTimestamp(2, currDate); pstmt.setTimestamp(2, currDate);
pstmt.setString(3, loginSiteCode);
pstmt.setString(4, loginCode);
} }
else if (field.equals("purc_order")) else if (field.equals("purc_order"))
{ {
pstmt.setString(1, "O"); pstmt.setString(1, "O");
pstmt.setString(2, loginSiteCode);
pstmt.setString(3, loginCode);
} }
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -966,6 +981,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca ...@@ -966,6 +981,14 @@ public class PackLabelWizEJB extends ValidatorEJB implements PackLabelWizEJBLoca
* @param input * @param input
* @return * @return
*/ */
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)
......
...@@ -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>");
......
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="1.0"
<xsl:output method="html"/> xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:decimal-format NaN="0"/> <xsl:output method="html" />
<xsl:decimal-format NaN="0" />
<xsl:template match="/">
<xsl:template match="/">
<html>
<html>
<script type="text/javascript" src="/ibase/webitm/js/ITMWizardCalendar.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script> <script type="text/javascript" src="/ibase/webitm/js/ITMWizardCalendar.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script> <script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script> <script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script>
<link href="/ibase/webitm/css/DD/ProductWizard.css" rel="stylesheet"/> <script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
<link href="/ibase/webitm/css/DD/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"/> <link href="/ibase/webitm/css/DD/jquery-ui-1.10.4.custom.min.css"
<link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet"/> rel="stylesheet" />
<link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet" />
<body> <link href="/ibase/webitm/css/Standard/default.css" rel="stylesheet" />
<form name="packLabelWizFormI" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet"> <link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet" />
<div id="header"> <style type="text/css">
<div id="headingText">Pack Label Wizard</div>
</div> .header_class
{border:inset 0;font-family: 'MuseoLight-300', sans-serif; color : #COCOCO; background : #FFF; text-align : left; font-size: 14px;}
<div class="mainPage-Container" style="overflow: auto;"> .input_editablecenter
{border:solid 0; font-family: 'MuseoLight-300', sans-serif; border-color: lightgrey;color : #COCOCO; background : #FFF; text-align : left; font-size: 14px;}
<div style="margin-top: 8px; width:100%; padding: 0px; float: left;"> .tableClass_rep
<div style="float: left; width:52%; border: 0px solid; padding: 0px;"> {margin-left:0px}
<table id="activityTable" border="0" cellSpacing="1" cellPadding="0" style="width:100%;">
<xsl:for-each select="//Detail1"> .td_leftAlign{
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable> background-color: #FFF;
<xsl:variable name="site_code_descr"><xsl:value-of select="site_code_descr"/></xsl:variable>
<xsl:variable name="site_code__supp"><xsl:value-of select="site_code__supp"/></xsl:variable> font-family: "MuseoLight-300",sans-serif;
<xsl:variable name="site_code__supp_descr"><xsl:value-of select="site_code__supp_descr"/></xsl:variable> font-size: 14px;
<xsl:variable name="contract_no"><xsl:value-of select="contract_no"/></xsl:variable> text-shadow: none;
<xsl:variable name="purc_order"><xsl:value-of select="purc_order"/></xsl:variable> text-align:left;
<xsl:variable name="supp_code"><xsl:value-of select="supp_code"/></xsl:variable> }
<xsl:variable name="supp_code_descr"><xsl:value-of select="supp_code_descr"/></xsl:variable>
<xsl:variable name="tran_code"><xsl:value-of select="tran_code"/></xsl:variable> .input_editable
<xsl:variable name="tran_name"><xsl:value-of select="tran_name"/></xsl:variable> {border:solid 1px;font-family: 'MuseoLight-300', sans-serif; border-color: #ccc;color : #COCOCO; background : #FFF; text-align : left; font-size: 14px;}
<xsl:variable name="tran_type"><xsl:value-of select="tran_type"/></xsl:variable>
<xsl:variable name="scac_code"><xsl:value-of select="scac_code"/></xsl:variable> .td_rightAlign{
<xsl:variable name="ship_date"><xsl:value-of select="ship_date"/></xsl:variable>
background-color: #FFF;
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> font-family: "MuseoLight-300",sans-serif;
font-size: 14px;
<tr> text-shadow: none;
<td class="td_rightAlign" nowrap="true"> text-align:right;
<strong>Purchase Contract :</strong> }
</td>
<td class="td_leftAlign"> .editDisplayheder
<div style="position:relative; width: 40%;"> {readOnly:true; TEXT-ALIGN:left; color:#000; padding:5px 5px 10px 5px; font-size:16px; }
<input type="text" class="editInputClass" value="{$contract_no}" name="Detail1.{normalize-space($dbID)}.contract_no"
id="Detail1.{normalize-space($dbID)}.contract_no" maxlength="10" ISCHANGED="false" readOnly = "1" .editDisplayColumnClass
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($site_code)}','contract_no', 'Contract No', 0);" {readOnly:true; margin-left:2px; BACKGROUND:#fff; TEXT-ALIGN:LEFT; margin-bottom:10px; border-top: #6cf 3px solid; border-bottom:solid 1px #ebebeb; border-right:solid 1px #ebebeb; border-left:solid 1px #ebebeb;}
size = "17" />
<div style="float: right;"> .editDisplayColumnClass td
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','contract_no', 'Contract No', 0);" { padding:5px; border-bottom: none; font-size:14px;}
style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.contract_no_pophelp" >
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -35px;" title="Select Purchase Contract"/>
</a>
</div> .button{
</div> border: 1px solid #E7E7E7;
</td> border-radius: 2px;
</tr> -moz-border-radius: 2px;
-webkit-border-radius: 2px;
<tr> -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
<td class="td_rightAlign" nowrap="true"> -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
<strong>Purchase Order :</strong> box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
</td> color: #333;
<td class="td_leftAlign"> height: 22px;
<div style="position:relative; width: 40%;"> font-family: 'MuseoLight-300', sans-serif;
<input type="text" class="editInputClass" value="{$purc_order}" name="Detail1.{normalize-space($dbID)}.purc_order" font-size: 12px;
id="Detail1.{normalize-space($dbID)}.purc_order" maxlength="10" ISCHANGED="false" readOnly = "1" background-color: #e7e7e7;
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($site_code)}','purc_order', 'Purc Order', 0);" cursor: pointer;
size = "17" /> margin-left:10px;
<div style="float: right;"> }
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','purc_order', 'Purc Order', 0);"
style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.purc_order_pophelp" > .button:hover
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -35px;" title="Select Purchase Order"/> {
</a> border: 1px solid #E7E7E7 !important;
</div> background-color: #e7e7e7 !important;
</div> color: #000 !important;
</td> -moz-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
</tr> -webkit-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
<tr> text-shadow: none;
<td class="td_rightAlign" nowrap="true"> }
<strong>Login Site :</strong>
</td> .button:active
<td class="td_leftAlign"> {
<div style="position:relative; width: 100%;"> text-shadow: none;
<input type="text" class="editInputClass" value="{$site_code}" name="Detail1.{normalize-space($dbID)}.site_code" background-color: #d6d6d6 !important;
id="Detail1.{normalize-space($dbID)}.site_code" maxlength="10" ISCHANGED="false" readOnly = "1" style="width: 20%;" /> color: #000 !important;
-moz-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
<input type="text" name="Detail1.{normalize-space($dbID)}.site_code_descr" id="Detail1.{normalize-space($dbID)}.site_code_descr" -webkit-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
value="{$site_code_descr}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 40%" /> box-shadow: 0 2px 1px rgba(0, 0, 0, 0.5) !important;
border: 1px solid #E7E7E7 !important;
}
.divclass
{
border : solid 1px lightgray;
line-height : 23px;
width:99.5%
}
.button.disabled {
background: #EBEBEB !important;
color:gray !IMPORTANT;
pointer-events:none !IMPORTANT;
}
.button.enabled {
color:#333 !IMPORTANT;
pointer-events:auto !IMPORTANT;
}
</style>
<body>
<form name="packLabelWizFormI" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" style="background-color: #f7f8fa;">
<TABLE border="0" width="99%" height="2%" class="header_td" cellpadding="0" cellspacing="0" >
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
Pack Label
</TD>
</div> </div>
</td> </TR>
</TABLE>
<div class="pageContentWrapper">
<table id="activityTable" Class="editDisplayColumnClass" border="0" cellSpacing="0" width="99%" cellPadding="5">
<xsl:for-each select="//Detail1">
<xsl:variable name="site_code">
<xsl:value-of select="site_code" />
</xsl:variable>
<xsl:variable name="site_code_descr">
<xsl:value-of select="site_code_descr" />
</xsl:variable>
<xsl:variable name="site_code__supp">
<xsl:value-of select="site_code__supp" />
</xsl:variable>
<xsl:variable name="site_code__supp_descr">
<xsl:value-of select="site_code__supp_descr" />
</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="supp_code">
<xsl:value-of select="supp_code" />
</xsl:variable>
<xsl:variable name="supp_code_descr">
<xsl:value-of select="supp_code_descr" />
</xsl:variable>
<xsl:variable name="tran_code">
<xsl:value-of select="tran_code" />
</xsl:variable>
<xsl:variable name="tran_name">
<xsl:value-of select="tran_name" />
</xsl:variable>
<xsl:variable name="tran_type">
<xsl:value-of select="tran_type" />
</xsl:variable>
<xsl:variable name="scac_code">
<xsl:value-of select="scac_code" />
</xsl:variable>
<xsl:variable name="ship_date">
<xsl:value-of select="ship_date" />
</xsl:variable>
<xsl:variable name="dbID">
<xsl:value-of select="@domID" />
</xsl:variable>
<tr>
<td class="td_rightAlign" nowrap="true">
<strong>Purchase Contract :</strong>
</td>
<td class="td_leftAlign">
<div style="position:relative; width: 50%;">
<input type="text" class="input_editable" value="{$contract_no}"
name="Detail1.{normalize-space($dbID)}.contract_no" id="Detail1.{normalize-space($dbID)}.contract_no"
maxlength="10" ISCHANGED="false" readOnly="1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($site_code)}','contract_no', 'Contract No', 0);"
style="width: 50%;"/>
<div style="width:1%;float: right;">
<a
href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','contract_no', 'Contract No', 0);"
style="float: left;text-decoration: none;"
id="Detail1.{normalize-space($dbID)}.contract_no_pophelp">
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -139px;"
title="Select Purchase Contract" />
</a>
</div>
</div>
</td>
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">
<strong>Purchase Order :</strong>
</td>
<td class="td_leftAlign">
<div style="position:relative; width: 50%;">
<input type="text" class="input_editable" value="{$purc_order}"
name="Detail1.{normalize-space($dbID)}.purc_order" id="Detail1.{normalize-space($dbID)}.purc_order"
maxlength="10" ISCHANGED="false" readOnly="1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($site_code)}','purc_order', 'Purchase Order', 0);" style="width: 50%;" />
<div style="width:1%; float: right;">
<a
href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','purc_order', 'Purchase Order', 0);"
style="float: left;text-decoration: none;"
id="Detail1.{normalize-space($dbID)}.purc_order_pophelp">
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -139px;"
title="Select Purchase Order" />
</a>
</div>
</div>
</td>
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">
<strong>Shipment Date :</strong>
</td>
<td>
<div style="position:relative; width: 50%;">
<input type="text" class="input_editable" value="{$ship_date}"
name="Detail1.{normalize-space($dbID)}.ship_date" id="Detail1.{normalize-space($dbID)}.ship_date"
maxlength="10" ISCHANGED="false" readOnly="1" style="width: 50%;" />
</div>
</td>
</tr>
<tr>
<!--
<td class="td_rightAlign" nowrap="true"> <strong>Login Site
:</strong> </td>
-->
<td class="td_leftAlign">
<div style="position:relative; width: 100%;">
<input type="hidden" class="input_editable" value="{$site_code}"
name="Detail1.{normalize-space($dbID)}.site_code" id="Detail1.{normalize-space($dbID)}.site_code"
maxlength="10" ISCHANGED="false" readOnly="1" style="width: 20%;" />
<input type="hidden"
name="Detail1.{normalize-space($dbID)}.site_code_descr"
id="Detail1.{normalize-space($dbID)}.site_code_descr"
value="{$site_code_descr}" class="editDisplayClass"
maxlength="0" ISCHANGED="false" readOnly="1" style="width: 40%" />
</div>
</td>
</tr>
<tr>
<!--
<td class="td_rightAlign" nowrap="true"> <strong>Supplier
Site :</strong> </td>
-->
<td class="td_leftAlign">
<div style="position:relative; width: 100%;">
<input type="hidden" class="input_editable" value="{$site_code__supp}"
name="Detail1.{normalize-space($dbID)}.site_code__supp"
id="Detail1.{normalize-space($dbID)}.site_code__supp"
maxlength="10" ISCHANGED="false" readOnly="1" style="width: 20%;" />
<input type="hidden"
name="Detail1.{normalize-space($dbID)}.site_code__supp_descr"
id="Detail1.{normalize-space($dbID)}.site_code__supp_descr"
value="{$site_code__supp_descr}" class="editDisplayClass"
maxlength="0" ISCHANGED="false" readOnly="1" style="width: 40%;" />
</div>
</td>
</tr>
<tr>
<!--
<td class="td_rightAlign" nowrap="true"> <strong>Supplier
:</strong> </td>
-->
<td>
<input type="hidden" class="input_editable" value="{$supp_code}"
name="Detail1.{normalize-space($dbID)}.supp_code" id="Detail1.{normalize-space($dbID)}.supp_code"
maxlength="10" ISCHANGED="false" readOnly="1" style="width: 20%;" />
<input type="hidden"
name="Detail1.{normalize-space($dbID)}.supp_code_descr" id="Detail1.{normalize-space($dbID)}.supp_code_descr"
value="{$supp_code_descr}" class="editDisplayClass"
maxlength="0" ISCHANGED="false" readOnly="1" style="width: 40%" />
</td>
</tr>
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_code"
id="Detail1.{normalize-space($dbID)}.tran_code" value="{$tran_code}"
class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_name"
id="Detail1.{normalize-space($dbID)}.tran_name" value="{$tran_name}"
class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_type"
id="Detail1.{normalize-space($dbID)}.tran_type" value="{$tran_type}"
class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.scac_code"
id="Detail1.{normalize-space($dbID)}.scac_code" value="{$scac_code}"
class="editDisplayClass" />
<tr style="height: 10px;">
</tr>
<tr>
<td class="td_leftAlign">
<input type="submit" style="cursor:hand" value="Next"
class="button" title='Next' id="next"
onclick="javascript:return checkNullvalidation()" />
</td>
</tr>
</xsl:for-each>
</table>
<br />
<br />
<div style="border: 1px solid transparent; width: 100%;">
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="packLabelWiz" name="OBJ_NAME"
id="OBJ_NAME" />
<input type="hidden" value="next" name="action" id="action" />
<table id="errorActivityTable" class="tableClass" border="0"
cellSpacing="2" cellPadding="1" width="98%">
<xsl:for-each select="//error">
<xsl:variable name="message">
<xsl:value-of select="message" />
</xsl:variable>
<xsl:variable name="description">
<xsl:value-of select="description" />
</xsl:variable>
<xsl:variable name="type">
<xsl:value-of select="type" />
</xsl:variable>
<xsl:variable name="dbID">
<xsl:value-of select="@domId" />
</xsl:variable>
<xsl:variable name="column_name">
<xsl:value-of select="@column_name" />
</xsl:variable>
<tr>
<xsl:if test="position() = 1">
<td class="td_leftAlign" nowrap="true" valign="bottom"
width="20%">
<xsl:value-of select="message" />
</td>
<td class="td_leftAlign" nowrap="true" valign="bottom"
width="40%">
Description :
<xsl:value-of select="description" />
</td>
</xsl:if>
<xsl:if test="$type = 'W'">
<td class="td_leftAlign" nowrap="true" valign="bottom"
width="20%">
Override Warnings :
<input type="checkbox" name="forceSave" value="false"
onClick="setChecked(this)" />
</td>
</xsl:if>
</tr>
</xsl:for-each>
</table>
</div>
</tr> <div id="buttonreplacement" style="margin-left:450px;display:none;">
<img src="/ibase/images/preload.gif" alt="Please wait work in progress" >
<tr> Please wait......
<td class="td_rightAlign" nowrap="true"> </img>
<strong>Supplier Site :</strong> </div>
</td> </div>
<td class="td_leftAlign"> </form>
<div style="position:relative; width: 100%;"> </body>
<input type="text" class="editInputClass" value="{$site_code__supp}" name="Detail1.{normalize-space($dbID)}.site_code__supp"
id="Detail1.{normalize-space($dbID)}.site_code__supp" maxlength="10" ISCHANGED="false" readOnly = "1" style="width: 20%;" /> </html>
</xsl:template>
<input type="text" name="Detail1.{normalize-space($dbID)}.site_code__supp_descr" id="Detail1.{normalize-space($dbID)}.site_code__supp_descr"
value="{$site_code__supp_descr}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 40%;"/>
</div>
</td>
<!-- <td colspan="2">
<input type="text" name="Detail1.{normalize-space($dbID)}.site_code__supp_descr" id="Detail1.{normalize-space($dbID)}.site_code__supp_descr"
value="{$site_code__supp_descr}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 100%" />
</td> -->
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">
<strong>Supplier :</strong>
</td>
<td>
<input type="text" class="editInputClass" value="{$supp_code}" name="Detail1.{normalize-space($dbID)}.supp_code"
id="Detail1.{normalize-space($dbID)}.supp_code" maxlength="10" ISCHANGED="false" readOnly = "1" style="width: 20%;" />
<input type="text" name="Detail1.{normalize-space($dbID)}.supp_code_descr" id="Detail1.{normalize-space($dbID)}.supp_code_descr"
value="{$supp_code_descr}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 40%" />
</td>
</tr>
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_code" id="Detail1.{normalize-space($dbID)}.tran_code"
value="{$tran_code}" class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_name" id="Detail1.{normalize-space($dbID)}.tran_name"
value="{$tran_name}" class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.tran_type" id="Detail1.{normalize-space($dbID)}.tran_type"
value="{$tran_type}" class="editDisplayClass" />
<input type="hidden" name="Detail1.{normalize-space($dbID)}.scac_code" id="Detail1.{normalize-space($dbID)}.scac_code"
value="{$scac_code}" class="editDisplayClass" />
<tr>
<td class="td_rightAlign" nowrap="true">
<strong>Shipment Date :</strong>
</td>
<td>
<input type="text" class="editInputClass" value="{$ship_date}" name="Detail1.{normalize-space($dbID)}.ship_date"
id="Detail1.{normalize-space($dbID)}.ship_date" maxlength="10" ISCHANGED="false" readOnly = "1" style="width: 20%;" />
</td>
</tr>
<tr style="height: 10px;">
</tr>
<tr>
<td>
<input type="submit" style="cursor:hand" value="Next" class="button" title='Next' id="next" onclick ="javascript:return checkNullvalidation()"/>
</td>
</tr>
</xsl:for-each>
</table>
</div>
</div>
<br/><br/>
<div style="border: 1px solid transparent; width: 100%;">
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="packLabelWiz" name="OBJ_NAME" id="OBJ_NAME"/>
<input type="hidden" value="next" name="action" id="action" />
<table id="errorActivityTable" class="tableClass" border="0" cellSpacing="2" cellPadding="1" width="98%">
<xsl:for-each select="//error">
<xsl:variable name="message"><xsl:value-of select="message"/></xsl:variable>
<xsl:variable name="description"><xsl:value-of select="description"/></xsl:variable>
<xsl:variable name="type"><xsl:value-of select="type"/></xsl:variable>
<xsl:variable name="dbID"><xsl:value-of select="@domId"/></xsl:variable>
<xsl:variable name="column_name"><xsl:value-of select="@column_name"/></xsl:variable>
<tr>
<xsl:if test="position() = 1">
<td class="td_leftAlign" nowrap="true" valign="bottom" width="20%" >
<xsl:value-of select="message"/>
</td>
<td class="td_leftAlign" nowrap="true" valign="bottom" width="40%" >
Description : <xsl:value-of select="description"/>
</td>
</xsl:if>
<xsl:if test="$type = 'W'">
<td class="td_leftAlign" nowrap="true" valign="bottom" width="20%">
Override Warnings :
<input type="checkbox" name="forceSave" value="false" onClick="setChecked(this)"/>
</td>
</xsl:if>
</tr>
</xsl:for-each>
</table>
</div>
<br/><br/>
</div>
</form>
</body>
</html>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
...@@ -11,18 +11,19 @@ ...@@ -11,18 +11,19 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
</head> </head>
<script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script>
<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/jquery-ui-1.10.4.custom.min.js"></script> <script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/sortable_table.js"></script> <script type="text/javascript" src="/ibase/webitm/js/sortable_table.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/fixed_table_rc.js"></script> <script type="text/javascript" src="/ibase/webitm/js/FixedTableHeader.js"></script>
<!--<link href="/ibase/webitm/css/DD/ProductWizard.css" rel="stylesheet" /--> <script type="text/javascript" src="/ibase/webitm/js/packLabelWizard.js"></script>
<link href="/ibase/webitm/css/DD/jquery-ui-1.10.4.custom.min.css" <link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet" />
rel="stylesheet" /> <link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet" />
<link href="/ibase/webitm/css/DD/fixed_table_rc.css" rel="stylesheet" /> <link href="/ibase/webitm/css/DD/jquery-ui-1.10.4.custom.min.css" rel="stylesheet" />
<link href="/ibase/webitm/css/theme/galaxy-theme.css" rel="stylesheet"/> <script language="Javascript" src="/ibase/webitm/js/jquery.datetimepicker.full.js"></script>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/jquery.datetimepicker.css"/>
<script language="JavaScript" type="text/javascript">
<!--<script language="JavaScript" type="text/javascript">
<![CDATA[ <![CDATA[
$(function() $(function()
...@@ -32,13 +33,14 @@ ...@@ -32,13 +33,14 @@
{ {
$("#mfgdate"+i+"").datepicker({ changeDate: true, changeMonth: true, changeYear: true, dateFormat : "dd/mm/y"}); $("#mfgdate"+i+"").datepicker({ changeDate: true, changeMonth: true, changeYear: true, dateFormat : "dd/mm/y"});
$("#expdate"+i+"").datepicker({ changeDate: true, changeMonth: true, changeYear: true, dateFormat : "dd/mm/y"}); $("#expdate"+i+"").datepicker({ changeDate: true, changeMonth: true, changeYear: true, dateFormat : "dd/mm/y"});
} }
}); });
]]> ]]>
</script> </script>
<script> --><!--<script>
<![CDATA[ <![CDATA[
$(document).ready(function() { $(document).ready(function() {
...@@ -49,56 +51,60 @@ ...@@ -49,56 +51,60 @@
height: "95%", height: "95%",
colModal: [ colModal: [
{ width: 20, align: 'center' }, { width: 20, align: 'center' },
{ width: 100, align: 'center' },
{ width: 100, align: 'center' },
{ width: 258, align: 'center' },
{ width: 50, align: 'center' },
{ width: 100, align: 'center' },
{ width: 100, align: 'center' },
{ width: 100, align: 'center' }, { width: 100, align: 'center' },
{ width: 80, align: 'center' },
{ width: 100, align: 'center' }, { width: 100, align: 'center' },
{ width: 150, align: 'center' },
{ width: 40, align: 'center' },
{ width: 120, align: 'center' },
{ width: 120, align: 'center' },
{ width: 140, align: 'center' },
{ width: 120, align: 'center' },
{ width: 100, align: 'center' }, { width: 100, align: 'center' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' }, { width: 102, align: 'center' }
{ width: 100, align: 'center' }
], ],
sort: true sort: true
}); });
}); });
]]> ]]>
</script> </script>
-->
<body> <body>
<form name="packLabelWizFormII" id="packLabelWizFormII" METHOD="post" <form name="packLabelWizFormII" id="packLabelWizFormII" METHOD="post"
ACTION="/ibase/ITMWizardHandlerServlet"> ACTION="/ibase/ITMWizardHandlerServlet">
<div class="pageContentWrapper" style="height:80%;overflow:auto;">
<div class="mainPage-Container" style="height: 100%;"> <TABLE border="0" width="100%" height="2%" class="header_td" cellpadding="0" cellspacing="0" style="background-color: #f7f8fa;">
<strong>Purchase Contract Details: </strong> <TR>
<div style="height:calc(100% - 130px); overflow: auto; margin-top: 8px;" id="detail"> <div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
<table id="packLabelDetail" cellspacing="0" width="100%"> <TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
<thead> Purchase Contract Details:
<tr> </TD>
<th> </div>
</TR>
</TABLE>
<table id="packLabelDetail" class="headertableClass" cellspacing="0" width="100%">
<thead class="table-head">
<tr >
<th class="tHeader">
<input type="checkbox" id="chkAll" onclick="return checkAll(this)" /> <input type="checkbox" id="chkAll" onclick="return checkAll(this)" />
</th> </th>
<th>Contract&#160;No</th> <th class="tHeader">Contract&#160;No</th>
<th>Supplier</th> <th class="tHeader">Item&#160;Code</th>
<th>Item&#160;Code</th> <th class="tHeader">Item&#160;Description</th>
<th>Item&#160;Description</th> <th class="tHeader">Unit</th>
<th>Unit</th> <th class="tHeader">Total&#160;Quantity</th>
<th>Total&#160;Quantity</th> <th class="tHeader">Quantity</th>
<th>Quantity</th> <th class="tHeader">Lot&#160;No</th>
<th>Lot&#160;No</th> <th class="tHeader">Shipper&#160;Size</th>
<th>Shipper&#160;Size</th> <th class="tHeader">No&#160;Art</th>
<th>No&#160;Art</th> <th class="tHeader">Expiry&#160;Date</th>
<th>Expiry&#160;Date</th> <th class="tHeader">Manufecture&#160;Date</th>
<th>Manufecture&#160;Date</th> <th class="tHeader">Case&#160;&#160;&#160;Label</th>
<th>Manufecture&#160;Site</th>
<th>Case&#160;Label</th>
</tr> </tr>
</thead> </thead>
<tbody class='table-body fadeInDown'> <tbody >
<xsl:for-each select="//Detail2"> <xsl:for-each select="//Detail2">
<xsl:variable name="purc_order"> <xsl:variable name="purc_order">
...@@ -173,6 +179,9 @@ ...@@ -173,6 +179,9 @@
<xsl:variable name="site_code__mfg"> <xsl:variable name="site_code__mfg">
<xsl:value-of select="site_code__mfg" /> <xsl:value-of select="site_code__mfg" />
</xsl:variable> </xsl:variable>
<xsl:variable name="line_no__ord">
<xsl:value-of select="line_no__ord" />
</xsl:variable>
<xsl:variable name="case_label"> <xsl:variable name="case_label">
<xsl:value-of select="case_label" /> <xsl:value-of select="case_label" />
</xsl:variable> </xsl:variable>
...@@ -185,43 +194,43 @@ ...@@ -185,43 +194,43 @@
</xsl:variable> </xsl:variable>
<xsl:if test="$dbIDs = '0'"> <xsl:if test="$dbIDs = '0'">
<input type="hidden" class="editInputClass" value="{$purc_order}" <input type="hidden" class="input_editable" value="{$purc_order}"
name="Detail2.{normalize-space($dbIDs)}.purc_order" id="purc_order" name="Detail2.{normalize-space($dbIDs)}.purc_order" id="purc_order"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$contract_no}" <input type="hidden" class="input_editable" value="{$contract_no}"
name="Detail2.{normalize-space($dbIDs)}.contract_no" id="contract_no" name="Detail2.{normalize-space($dbIDs)}.contract_no" id="contract_no"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$site_code}" <input type="hidden" class="input_editable" value="{$site_code}"
name="Detail2.{normalize-space($dbIDs)}.site_code" id="site_code" name="Detail2.{normalize-space($dbIDs)}.site_code" id="site_code"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$site_code_descr}" <input type="hidden" class="input_editable" value="{$site_code_descr}"
name="Detail2.{normalize-space($dbIDs)}.site_code_descr" id="site_code_descr" name="Detail2.{normalize-space($dbIDs)}.site_code_descr" id="site_code_descr"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$site_code__supp}" <input type="hidden" class="input_editable" value="{$site_code__supp}"
name="Detail2.{normalize-space($dbIDs)}.site_code__supp" id="site_code__supp" name="Detail2.{normalize-space($dbIDs)}.site_code__supp" id="site_code__supp"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$site_code__supp_descr}" <input type="hidden" class="input_editable" value="{$site_code__supp_descr}"
name="Detail2.{normalize-space($dbIDs)}.site_code__supp_descr" name="Detail2.{normalize-space($dbIDs)}.site_code__supp_descr"
id="site_code__supp_descr" maxlength="10" /> id="site_code__supp_descr" maxlength="10" />
<input type="hidden" class="editInputClass" value="{$supp_code}" <input type="hidden" class="input_editable" value="{$supp_code}"
name="Detail2.{normalize-space($dbIDs)}.supp_code" id="supp_code" name="Detail2.{normalize-space($dbIDs)}.supp_code" id="supp_code"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$supp_code_descr}" <input type="hidden" class="input_editable" value="{$supp_code_descr}"
name="Detail2.{normalize-space($dbIDs)}.supp_code_descr" id="supp_code_descr" name="Detail2.{normalize-space($dbIDs)}.supp_code_descr" id="supp_code_descr"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$tran_code}" <input type="hidden" class="input_editable" value="{$tran_code}"
name="Detail2.{normalize-space($dbIDs)}.tran_code" id="tran_code" name="Detail2.{normalize-space($dbIDs)}.tran_code" id="tran_code"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$tran_name}" <input type="hidden" class="input_editable" value="{$tran_name}"
name="Detail2.{normalize-space($dbIDs)}.tran_name" id="tran_name" name="Detail2.{normalize-space($dbIDs)}.tran_name" id="tran_name"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$tran_type}" <input type="hidden" class="input_editable" value="{$tran_type}"
name="Detail2.{normalize-space($dbIDs)}.tran_type" id="tran_type" name="Detail2.{normalize-space($dbIDs)}.tran_type" id="tran_type"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$scac_code}" <input type="hidden" class="input_editable" value="{$scac_code}"
name="Detail2.{normalize-space($dbIDs)}.scac_code" id="scac_code" name="Detail2.{normalize-space($dbIDs)}.scac_code" id="scac_code"
maxlength="10" /> maxlength="10" />
<input type="hidden" class="editInputClass" value="{$ship_date}" <input type="hidden" class="input_editable" value="{$ship_date}"
name="Detail2.{normalize-space($dbIDs)}.ship_date" id="ship_date" name="Detail2.{normalize-space($dbIDs)}.ship_date" id="ship_date"
maxlength="10" /> maxlength="10" />
</xsl:if> </xsl:if>
...@@ -235,7 +244,7 @@ ...@@ -235,7 +244,7 @@
</SCRIPT> </SCRIPT>
<tr> <tr class="trClass">
<td> <td>
<xsl:choose> <xsl:choose>
<xsl:when test="$chkbox ='Y'"> <xsl:when test="$chkbox ='Y'">
...@@ -248,38 +257,29 @@ ...@@ -248,38 +257,29 @@
<input type="checkbox" <input type="checkbox"
name="Detail2.{normalize-space($dbIDs)}.selectbox" id="Detail2.{normalize-space($dbIDs)}.selectbox" name="Detail2.{normalize-space($dbIDs)}.selectbox" id="Detail2.{normalize-space($dbIDs)}.selectbox"
value="false" onClick="setChecked(this)" style='text-align: right;' /> value="false" onClick="setChecked(this)" style='text-align: right;' />
<!-- style="visibility: show; width: 0px;"/> -->
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<!-- <xsl:value-of select="contract_no"/> -->
</td> </td>
<td> <td >
<input type="hidden" class="editInputClass" value="{$contract_no}" <input type="hidden" class="input_editable" value="{$contract_no}"
name="Detail2.{normalize-space($dbIDs)}.contract_no" id="Detail2.{normalize-space($dbIDs)}.contract_no" name="Detail2.{normalize-space($dbIDs)}.contract_no" id="Detail2.{normalize-space($dbIDs)}.contract_no"
maxlength="10" /> maxlength="10" />
<xsl:value-of select="contract_no" /> <xsl:value-of select="contract_no" />
</td> </td>
<td> <td>
<input type="hidden" class="editInputClass" value="{$supp_code}" <input type="hidden" class="input_editable" value="{$item_code}"
name="Detail2.{normalize-space($dbIDs)}.supp_code" id="Detail2.{normalize-space($dbIDs)}.supp_code"
maxlength="10" />
<xsl:value-of select="supp_code" />
</td>
<td>
<input type="hidden" class="editInputClass" value="{$item_code}"
name="Detail2.{normalize-space($dbIDs)}.item_code" id="Detail2.{normalize-space($dbIDs)}.item_code" name="Detail2.{normalize-space($dbIDs)}.item_code" id="Detail2.{normalize-space($dbIDs)}.item_code"
maxlength="10" /> maxlength="10" />
<xsl:value-of select="item_code" /> <xsl:value-of select="item_code" />
</td> </td>
<td> <td nowrap="true">
<input type="hidden" class="editInputClass" value="{$item_descr}" <input type="hidden" class="input_editable" value="{$item_descr}"
name="Detail2.{normalize-space($dbIDs)}.item_descr" id="Detail2.{normalize-space($dbIDs)}.item_descr" name="Detail2.{normalize-space($dbIDs)}.item_descr" id="Detail2.{normalize-space($dbIDs)}.item_descr"
maxlength="10" /> maxlength="10" />
<xsl:value-of select="item_descr" /> <xsl:value-of select="item_descr" />
</td> </td>
<td> <td>
<input type="hidden" class="editInputClass" value="{$unit}" <input type="hidden" class="editInputClass" value="{$unit}"
...@@ -291,17 +291,17 @@ ...@@ -291,17 +291,17 @@
<input type="hidden" class="editInputClass" value="{$tot_quantity}" <input type="hidden" class="editInputClass" value="{$tot_quantity}"
name="Detail2.{normalize-space($dbIDs)}.tot_quantity" id="Detail2.{normalize-space($dbIDs)}.tot_quantity" name="Detail2.{normalize-space($dbIDs)}.tot_quantity" id="Detail2.{normalize-space($dbIDs)}.tot_quantity"
maxlength="10" /> maxlength="10" />
<xsl:value-of select="tot_quantity" /> <xsl:value-of select="tot_quantity" />
</td> </td>
<td> <td>
<input type="text" class="editInputClass" value="{$quantity}" <input type="text" class="editInputClass" value="{$quantity}"
name="Detail2.{normalize-space($dbIDs)}.quantity" id="Detail2.{normalize-space($dbIDs)}.quantity" name="Detail2.{normalize-space($dbIDs)}.quantity" id="Detail2.{normalize-space($dbIDs)}.quantity"
maxlength="10" size="10" style='text-align: right;' maxlength="10" size="10" style='text-align: right;'
onchange = 'setCheckedBox({normalize-space($dbIDs)})'
onkeypress='return isNumeric(event)' onkeypress='return isNumeric(event)'
onblur="javascript:calculateNoArt({normalize-space($dbIDs)})" /> onblur="javascript:calculateNoArt({normalize-space($dbIDs)})" />
<!-- <xsl:value-of select="quantity"/> -->
</td> </td>
<td> <td>
<input type="text" class="editInputClass" value="{$lot_no}" <input type="text" class="editInputClass" value="{$lot_no}"
name="Detail2.{normalize-space($dbIDs)}.lot_no" id="Detail2.{normalize-space($dbIDs)}.lot_no" name="Detail2.{normalize-space($dbIDs)}.lot_no" id="Detail2.{normalize-space($dbIDs)}.lot_no"
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
<td> <td>
<input type="text" class="editInputClass" value="{$shipper_size}" <input type="text" class="editInputClass" value="{$shipper_size}"
name="Detail2.{normalize-space($dbIDs)}.shipper_size" id="Detail2.{normalize-space($dbIDs)}.shipper_size" name="Detail2.{normalize-space($dbIDs)}.shipper_size" id="Detail2.{normalize-space($dbIDs)}.shipper_size"
maxlength="11" size="15" style='text-align: right;' maxlength="11" size="11" style='text-align: right;'
onkeypress='return isNumeric(event)' onkeypress='return isNumeric(event)'
onblur="javascript:calculateNoArt({normalize-space($dbIDs)})" /> onblur="javascript:calculateNoArt({normalize-space($dbIDs)})" />
</td> </td>
...@@ -323,31 +323,34 @@ ...@@ -323,31 +323,34 @@
id="Detail2.{normalize-space($dbIDs)}.no_art" maxlength="11" id="Detail2.{normalize-space($dbIDs)}.no_art" maxlength="11"
ISCHANGED="false" readOnly="1" ISCHANGED="false" readOnly="1"
style='text-align: center; width: 90%; border: none;' /> style='text-align: center; width: 90%; border: none;' />
<!-- <xsl:value-of select="no_art"/> -->
</td> </td>
<td> <td nowrap="true">
<input type="text" class="editInputClass" value="{$exp_date}" <input type="text" class="input_editable" size="8" value="{$exp_date}" name="Detail2.{normalize-space($dbIDs)}.exp_date" id="expDate{normalize-space($dbIDs)}" maxlength="8" ISCHANGED="false" placeholder = "DD/MM/YY"/>
name="Detail2.{normalize-space($dbIDs)}.exp_date" id="expdate{normalize-space($dbIDs)}" <img border="0" src="/ibase/webitm/images/calender.png" id="exp_date" name="exp_date" onClick="javascript:setDate('expDate{normalize-space($dbIDs)}');"/>
maxlength="10" size="10" readOnly = "1"/>
<xsl:value-of select="exp_date" />
</td> </td>
<td> <td nowrap="true">
<input type="text" class="editInputClass" value="{$mfg_date}" <input type="text" class="input_editable" size="8" value="{$mfg_date}" name="Detail2.{normalize-space($dbIDs)}.mfg_date" id="mfgDate{normalize-space($dbIDs)}" maxlength="8" ISCHANGED="false" placeholder = "DD/MM/YY"/>
<img border="0" src="/ibase/webitm/images/calender.png" id="mfg_date" name="mfg_date" onClick="javascript:setDate('mfgDate{normalize-space($dbIDs)}');"/>
<!--<input type="text" class="editInputClass" value="{$mfg_date}"
name="Detail2.{normalize-space($dbIDs)}.mfg_date" id="mfgdate{normalize-space($dbIDs)}" name="Detail2.{normalize-space($dbIDs)}.mfg_date" id="mfgdate{normalize-space($dbIDs)}"
maxlength="10" size="10" readOnly = "1"/> maxlength="10" size="10" readOnly="1" />
<xsl:value-of select="mfg_date" /> <xsl:value-of select="mfg_date" />-->
</td>
<td> <input type="hidden" class="editInputClass" value="{$site_code__mfg}"
<input type="text" class="editInputClass" value="{$site_code__mfg}"
name="Detail2.{normalize-space($dbIDs)}.site_code__mfg" name="Detail2.{normalize-space($dbIDs)}.site_code__mfg"
id="Detail2.{normalize-space($dbIDs)}.site_code__mfg" id="Detail2.{normalize-space($dbIDs)}.site_code__mfg"
maxlength="5" size="10"/> maxlength="5" size="10" />
<xsl:value-of select="site_code__mfg" />
<input type="hidden" class="editInputClass" value="{$line_no__ord}"
name="Detail2.{normalize-space($dbIDs)}.line_no__ord"
id="Detail2.{normalize-space($dbIDs)}.line_no__ord"
maxlength="5" size="10" />
</td> </td>
<td> <td nowrap="true">
<input type="hidden" class="editInputClass" value="{$case_label}" <input type="hidden" class="editInputClass" value="{$case_label}"
name="Detail2.{normalize-space($dbIDs)}.case_label" id="Detail2.{normalize-space($dbIDs)}.case_label" name="Detail2.{normalize-space($dbIDs)}.case_label" id="Detail2.{normalize-space($dbIDs)}.case_label"
maxlength="10" /> maxlength="10" />
...@@ -368,7 +371,7 @@ ...@@ -368,7 +371,7 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td colspan="2"> <td class="td_leftAlign" colspan="2">
<input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" /> <input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="packLabelWiz" name="OBJ_NAME" /> <input type="hidden" value="packLabelWiz" name="OBJ_NAME" />
<input type="hidden" value="" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
...@@ -378,19 +381,29 @@ ...@@ -378,19 +381,29 @@
<input type="submit" style="cursor:hand" class="button" <input type="submit" style="cursor:hand" class="button"
value="Cancel" title='Cancel' id="previous" value="Cancel" title='Cancel' id="previous"
onclick="javascript:setActionVal('previous');" /> onclick="javascript:setActionVal('previous');" />
<input type="submit" style="cursor:hand" class="button" <input type="submit" style="cursor:hand" class="button"
value="Previous" title='Previous' id="prev" value="Previous" title='Previous' id="prev"
onclick="javascript:createXMLString()" /> onclick="javascript:createXMLString()" />
</td>
<td class="td_rightAlign" colspan="2">
<input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="packLabelWiz" name="OBJ_NAME" />
<input type="hidden" value="" name="action" id="action" />
<input type="hidden" value="1:MP" name="formType" id="formType" />
<input type="hidden" value="" name="PRE_FORM_VAL" ID="PRE_FORM_VAL" />
<input type="submit" style="cursor:hand" class="button" <input type="submit" style="cursor:hand" class="button"
value="Finish" title='Finish' id="finish" value="Finish" title='Finish' id="finish"
onclick="javascript:return checkValidation();" /> onclick="javascript:return checkValidation();" />
</td> </td>
</tr> </tr>
</table> </table>
<div id="buttonreplacement" style="margin-left:450px; display:none;" >
<img src="/ibase/images/preload.gif" alt="Please wait work in progress" >
Please wait......
</img>
</div>
<table id="errorActivityTable" class="tableClass" border="0" <table id="errorActivityTable" class="tableClass" border="0"
cellSpacing="2" cellPadding="1" width="98%"> cellSpacing="2" cellPadding="1" width="98%">
...@@ -434,18 +447,23 @@ ...@@ -434,18 +447,23 @@
</tr> </tr>
</xsl:for-each> </xsl:for-each>
</table> </table>
</div>
<!--changed by Manish--> <div id="caseListDiv" style="display:none;">
<div id="caseListDiv"> <div style="overflow: auto; height: 300px;">
<div style="overflow: auto; height: 250px;">
<table class='tableClass' id="SKUPackListId" <table class='tableClass' id="SKUPackListId"
style="text-align: center; width: 350px; margin: 0 auto;"> style="text-align: center; width: 350px; margin: 0 auto;">
<caption id="SKUPackListCaption" class="captionClass">Case Label <!--<caption id="SKUPackListCaption" class="captionClass" style="border-bottom: #6cf 3px solid;">Case Label Details</caption>-->
Details</caption> <TR>
<tbody class='table-body'> <div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:0px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 20px;font-size:16px;" width="2%" >
Case Label Details
</TD>
</div>
</TR>
<tbody class='table-body' style="border-top: #6cf 3px solid;">
<tr> <tr>
<td>Purchase Contract / Order:</td> <td nowrap="true">Purchase Contract/Order:</td>
<td> <td>
<input type="text" onchange="return isNumeric(this)" <input type="text" onchange="return isNumeric(this)"
class="editInputClass" style="text-align: left;" id="p_contract_no" class="editInputClass" style="text-align: left;" id="p_contract_no"
...@@ -485,23 +503,22 @@ ...@@ -485,23 +503,22 @@
value="" maxlength="5" /> value="" maxlength="5" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<input type="hidden" id="idNumPack" /> <input type="hidden" id="idNumPack" />
<div class="popDiv"> <div class="popDiv" style="margin-top: 12px; margin-left: 16px;">
<input type="button" style="cursor:hand"
class="button green-Btn pophelp-okcancel" value="Print" title='Print'
onclick="javascript:printCaseLabel(idNumPack)" />
<input type="submit" style="cursor:hand" <input type="submit" style="cursor:hand"
class="button red-Btn pophelp-okcancel" value="Cancel" title='Cancel' class="button red-Btn pophelp-okcancel" value="Cancel" title='Cancel'
onclick="javascript:closePopup()" /> onclick="javascript:closePopup()" />
<input type="button" style="cursor:hand"
class="button green-Btn pophelp-okcancel" value="Print" title='Print'
onclick="javascript:printCaseLabel(idNumPack)" />
</div> </div>
</div> </div>
<!--changed by Manish-->
</form> </form>
</body> </body>
......
...@@ -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>
......
...@@ -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