Skip to content

B
business-java
Commit 96300a6e authored by rsharma's avatar rsharma
Browse files
Options

DI90SUN059 properly set mfg_date ,exp_date on click packlist and nett_weight 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91331 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 098ae637
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 12 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ 96300a6e
......@@ -447,11 +447,19 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
{
stkMfgDate1 = sdf.format(stkMfgDate);
}
else
{
stkMfgDate1 = "";
}
stkExpDate = rs.getDate("EXP_DATE");
if(stkExpDate != null)
{
stkExpDate1 = sdf.format(stkExpDate);
}
else
{
stkExpDate1 = "";
}
stkquantity = rs.getString("QUANTITY");
balanceQty = rs.getString("BALANCE_QTY");
stkLocCode = rs.getString("LOC_CODE");
......@@ -1165,13 +1173,21 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if (expDate != null)
{
sexpDate = sdf.format(expDate).toString();
valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append(sexpDate).append("</exp_date>");
}
else
{
sexpDate = "";
}
valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append(sexpDate).append("</exp_date>");
if (mfgDate != null)
{
smfgDate = sdf.format(mfgDate).toString();
valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append(smfgDate).append("</mfg_date>");
}
else
{
smfgDate = "";
}
valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append(smfgDate).append("</mfg_date>");
lineNoSord = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);
valueXmlString.append(lineNoSord); /// 16-08
lotNo = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn);
......@@ -1624,10 +1640,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0;
double detQty = 0;
long noArt = 0;
Timestamp expDate = null ,mfgDate=null;
ArrayList qty = new ArrayList();
ArrayList orderNoArrList = new ArrayList();
ResultSet rs = null;
String detailCnt = "0";
String detailCnt = "0",sExpDate= "",sMfgDate = "";
ResultSet rs1 = null;
Connection conn = null;
Statement stmt = null;
......@@ -1644,7 +1661,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//{
conn = connDriver.getConnectDB("DriverITM");
stmt = conn.createStatement();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
saleOrder = genericUtility.getColumnValue("sord_no",dom);
despId = genericUtility.getColumnValue("desp_id",dom1);
System.out.println("saleOrder :"+saleOrder);
......@@ -1725,7 +1742,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("sqlOrderNoDo :"+sqlOrderNoDo);
stmt = conn.createStatement();
rs = stmt.executeQuery(sqlOrderNoDo);
if (rs.next())
while (rs.next())
{
orderNoDo = rs.getString(1);
if(orderNoDo != null){
......@@ -1739,7 +1756,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
String orderNoTemp = "";
for(int ctr = 0;ctr < orderNoListSize;ctr++){
orderNoTemp = orderNoArrList.get(ctr).toString();
orderNo = "'".concat(orderNoTemp).concat("',");
orderNo = orderNo + "'".concat(orderNoTemp).concat("',");
}
System.out.println("orderNo :: "+orderNo);
......@@ -1770,7 +1787,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
+"INV_PACK_RCP.NET_WEIGHT, "
+"INV_PACK_RCP.NO_ART, "
+"INV_PACK_RCP.DIMENSION, "
+"'Y' AS PROCESS_YN "
+"'Y' AS PROCESS_YN ,"
+" STOCK.MFG_DATE, STOCK.EXP_DATE "
+"FROM INV_PACK, INV_PACK_RCP, STOCK "
+"WHERE INV_PACK.TRAN_ID = INV_PACK_RCP.TRAN_ID "
+"AND INV_PACK_RCP.ITEM_CODE = STOCK.ITEM_CODE "
......@@ -1808,6 +1826,21 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<no_art>").append("<![CDATA[").append(rs.getInt(16)).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(17)).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n");
mfgDate = rs.getTimestamp(19);
expDate = rs.getTimestamp(20);
if(mfgDate !=null)
{
sMfgDate = sdf.format(mfgDate).toString();
valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA["+ sMfgDate + "]]>").append("</mfg_date>\r\n");
}
sExpDate = "";
if(expDate !=null)
{
sExpDate = sdf.format(expDate).toString();
valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>\r\n");
}
valueXmlString.append("</Detail>\r\n");
}//while end
valueXmlString.append("</Root>\r\n");
......@@ -1838,6 +1871,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
String taxClass = "", taxChap = "", taxEnv = "", unit = "",unitStd = "";
String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr = "", dimension = "";
String grossWt = "", tareWt = "", netWt = "", noArt1 = "";
String sExpDate="" , sMfgDate="" ;
double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0;
double detQty = 0, noArt = 0;
NodeList detailList = null;
......@@ -1990,6 +2024,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
tareWt = genericUtility.getColumnValueFromNode("tare_weight",currDetail);
netWt = genericUtility.getColumnValueFromNode("nett_weight",currDetail);
noArt1 = genericUtility.getColumnValueFromNode("no_art",currDetail);
sExpDate = genericUtility.getColumnValueFromNode("exp_date",currDetail);
sMfgDate = genericUtility.getColumnValueFromNode("mfg_date",currDetail);
if (grossWt != null)
{
grossWeight = Double.parseDouble(grossWt);
......@@ -2054,8 +2090,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "gross_weight", grossWeight );
valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
setNodeValue( dom, "tare_weight", tareWeight );
valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight).append("]]>").append("</nett_weight>\r\n");
setNodeValue( dom, "nett_weight", netWeight);
valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append((grossWeight - tareWeight)).append("]]>").append("</nett_weight>\r\n");
setNodeValue( dom, "nett_weight", (grossWeight - tareWeight));
//setNodeValue( dom, "nett_weight", netWeight);
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
setNodeValue( dom, "no_art", noArt );
valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append((dimension == null) ? "":dimension).append("]]>").append("</dimension>\r\n");
......@@ -2066,6 +2103,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "tax_chap", (taxChap == null) ? "":taxChap );
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ? "":taxEnv).append("]]>").append("</tax_env>\r\n");
setNodeValue( dom, "tax_env", (taxEnv == null) ? "":taxEnv );
if (sExpDate != null)
{
valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sExpDate).append("]]>").append("</exp_date>\r\n");
setNodeValue( dom, "exp_date", sExpDate );
}
if (sMfgDate != null)
{
valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sMfgDate).append("]]>").append("</mfg_date>\r\n");
setNodeValue( dom, "mfg_date", (sMfgDate == null) ? "" : sMfgDate );
}
valueXmlString.append("</Detail>\r\n");
}
valueXmlString.append("</Root>\r\n");
......@@ -5970,11 +6017,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(effCost).append("]]>").append("</rate__clg>\r\n");
setNodeValue( dom, "rate__clg", effCost );
}
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append(taxcl).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append((taxcl == null) ? "" : taxcl).append("]]>").append("</tax_class>\r\n");
setNodeValue( dom, "tax_class", (taxcl == null) ? "" : taxcl );
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append(taxch).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append((taxch == null) ? "" : taxch).append("]]>").append("</tax_chap>\r\n");
setNodeValue( dom, "tax_chap", (taxch == null) ? "" : taxch );
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append(taxen).append("]]>").append("</tax_env>\r\n");
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxen == null) ? "" : taxen).append("]]>").append("</tax_env>\r\n");
setNodeValue( dom, "tax_env", (taxen == null) ? "" : taxen );
mloc = genericUtility.getColumnValue("lot_code",dom); //miss6 no use of mloc
valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(mpack).append("]]>").append("</pack_instr>\r\n");
......
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