Skip to content

B
business-java
Commit 4293493d authored by manohar's avatar manohar
Browse files
Options

DI90SUN060 chages for packlist and default button 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91365 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f92cca7a
Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 150 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ 4293493d
......@@ -665,9 +665,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
java.sql.Date expDate = null;
java.sql.Date mfgDate = null;
String sexpDate = null;
String smfgDate = null;
String smfgDate = null, tempStr = "";
ArrayList qtyFact = new ArrayList();
ArrayList qtyFact = null;
DistCommon distCommon = new DistCommon();
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
GenericUtility genericUtility = GenericUtility.getInstance();
......@@ -947,6 +947,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("palletWt.."+palletWt);
System.out.println("qtyStk.."+qtyStk+"..grossWeight.."+grossWeight+"..grossWtPerArt.."+grossWtPerArt);
System.out.println("netWeight.."+netWeight+"..tareWeight.."+tareWeight+"..tareWtPerArt.."+tareWtPerArt);
if (qtyStk > balQty)
{
qtyStk = balQty;
}
if (qtyStk > 0)
{
grossPer = (grossWeight / qtyStk) ;
......@@ -1054,16 +1058,24 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
looseQty = balQty - ( shipperQtyNew + integralQtyNew );
qtyDetailStr = "Shipper Quantity = " + shipperQtyNew +" Integral Quantity = " + integralQtyNew + " Loose Quantity = " + looseQty ;
qtyFact = null;
qtyFact = new ArrayList();
if (!unit1.equals(unitStd1))
{
qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, balQty, conv, conn);
//qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, balQty, conv, conn);
qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, qtyStk, conv, conn);
System.out.println("qtyFact.get(1) :"+qtyFact.get(0));
}
else
{
qtyFact.add(Integer.toString(1));
qtyFact.add(Double.toString(balQty));
//qtyFact.add(Double.toString(balQty));
qtyFact.add(Double.toString(qtyStk));
}
inputQty = Double.parseDouble(qtyFact.get(1).toString());
System.out.println("manohar 20/09/10 inputQty ["+inputQty + "] qtyStk [" + qtyStk + "] balQty [ " + balQty + "]");
System.out.println("qtyPerArt::::::::::::: "+qtyPerArt);
if ( qtyPerArt > 0 )
{
......@@ -1106,10 +1118,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "sord_no", (sordNo == null) ? "":sordNo );
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append(lineNoSord).append("</line_no__sord>"); //chg1
setNodeValue( dom, "line_no__sord", (lineNoSord == null) ? "":lineNoSord );
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);
valueXmlString.append(tempStr); /// 16-08
//lineNoSord = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);
//valueXmlString.append(lineNoSord); /// 16-08
valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append(expLevel).append("</exp_lev>");
setNodeValue( dom, "exp_lev", (expLevel == null) ? "":expLevel );
valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append((expLevel == null ? "":expLevel)).append("</exp_lev>");
setNodeValue( dom, "exp_lev", (expLevel == null ? "":expLevel) );
tempStr = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn);
valueXmlString.append(tempStr);
valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode.trim()).append("]]>").append("</item_code>\r\n");
setNodeValue( dom, "item_code", (itemCode == null) ? "":itemCode );
valueXmlString.append("<item_code__ord isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCodeOrd).append("]]>").append("</item_code__ord>\r\n");
......@@ -1136,7 +1153,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode );
System.out.println("28/08/10 packQty 1 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(balQty).append("]]>").append("</quantity__stduom>\r\n");
//valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(balQty).append("]]>").append("</quantity__stduom>\r\n");
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity__stduom>\r\n");
valueXmlString.append("<qty_details isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyDetailStr).append("]]>").append("</qty_details>\r\n");
valueXmlString.append("<discount isSrvCallOnChg='0'>").append("<![CDATA[").append(discount).append("]]>").append("</discount>\r\n");
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
......@@ -1156,16 +1175,18 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduom).append("]]>").append("</rate__stduom>\r\n");
//next line commented as it gets set from lot no item change on 041108 by msalam
//valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate__clg>\r\n");
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(balQty).append("</quantity>");
setNodeValue( dom, "quantity", balQty );
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append((taxClass == null) ?"":taxClass).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append((taxChap == null) ?"":taxChap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ?"":taxEnv).append("]]>").append("</tax_env>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append(lotSl).append("</lot_sl>");
setNodeValue( dom, "lot_sl", (lotSl == null) ? "":lotSl );
valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append(lotNo).append("</lot_no>");//chg2
setNodeValue( dom, "lot_no", (lotNo == null) ? "":lotNo );
//valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(balQty).append("</quantity>");
//setNodeValue( dom, "quantity", balQty );
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(qtyStk).append("</quantity>");
setNodeValue( dom, "quantity", qtyStk );
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append((taxClass == null) ?"":taxClass).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append((taxChap == null) ?"":taxChap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ?"":taxEnv).append("]]>").append("</tax_env>\r\n");
//lotNo = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn);
//valueXmlString.append(lotNo); ///// 16-08
// 27/06/09 manoharan set the mfg_date and exp_date from stock
......@@ -1188,11 +1209,18 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
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);
valueXmlString.append(lotNo); ///// 16-08
//lineNoSord = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);
//valueXmlString.append(lineNoSord); /// 16-08
tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn);
valueXmlString.append(tempStr); ///// 16-08
// end 27/06/09 manoharan set the mfg_date and exp_date from stock
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(qtyStk).append("</quantity>");
setNodeValue( dom, "quantity", qtyStk );
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity__stduom>\r\n");
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStk).append("]]>").append("</quantity_real>\r\n");
setNodeValue( dom, "quantity_real", qtyStk );
valueXmlString.append("</Detail>");
/*
valueXmlString.append("<line_no__sord isSrvCallOnChg='1'>").append(lineNoSord).append("</line_no__sord>");
......@@ -1204,7 +1232,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append(icQtyOrd).append("</pending_qty>");
valueXmlString.append("</Detail>");
*/
icQtyOrd = icQtyOrd - balQty;
//icQtyOrd = icQtyOrd - balQty;
icQtyOrd = icQtyOrd - qtyStk;
}//if (icQtyOrd > 0)
}
valueXmlString.append("</Root>");
......@@ -1819,12 +1849,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<quantity>").append("<![CDATA[").append(rs.getDouble(9)).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(10)).append("]]>").append("</unit>\r\n");
valueXmlString.append("<pack_code>").append("<![CDATA[").append(rs.getString(11)).append("]]>").append("</pack_code>\r\n");
valueXmlString.append("<pack_instr>").append("<![CDATA[").append(rs.getString(12)).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("<pack_instr>").append("<![CDATA[").append((rs.getString(12) == null) ? "":rs.getString(12)).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("<gross_weight>").append("<![CDATA[").append(rs.getDouble(13)).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(rs.getDouble(14)).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<net_weight>").append("<![CDATA[").append(rs.getDouble(15)).append("]]>").append("</net_weight>\r\n");
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("<dimension>").append("<![CDATA[").append((rs.getString(17) == null) ? "":rs.getString(17)).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n");
valueXmlString.append("</Detail>\r\n");
......@@ -1858,7 +1890,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr = "", dimension = "";
String grossWt = "", tareWt = "", netWt = "", noArt1 = "";
String sExpDate="" , sMfgDate="" ,sRetestDate ="" ,siteCode = "";
String sql ="";
String sql ="", tempStr = "";
PreparedStatement pstmt = null;
Timestamp retestDate = null ,mfgDate = null, expDate = null;
double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0;
......@@ -1979,8 +2011,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNoOrd).append("]]>").append("</line_no__sord>\r\n");
setNodeValue( dom, "line_no__sord", lineNoOrd );
lineNoOrd = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);//chg3
valueXmlString.append(lineNoOrd);
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);//chg3
valueXmlString.append(tempStr);
valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n");
setNodeValue( dom, "exp_lev", expLev );
......@@ -1993,21 +2025,23 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(unitStd).append("]]>").append("</unit__std>\r\n");
//setNodeValue( dom, "desp_id", (despId == null) ? "":despId );
itemCode = genericUtility.getColumnValueFromNode("item_code",currDetail);
//valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
//setNodeValue( dom, "item_code", (itemCode == null) ? "":itemCode );
quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity",currDetail));
qtyStd = quantity;
conv = 0;
System.out.println("manohar 14/10/10 qtyStd 1 ["+qtyStd + "]");
if (!unit.trim().equals(unitStd.trim())) //REMOVED NOT SYMBOL
{
qty = distCommon.getConvQuantityFact(unitStd, unit, itemCode, qtyStd, conv, conn);
}
else
{
qty.add(0, new Double(qtyStd));
qty.add(1,new Double(1));
qty.add(0, new Double(1));
qty.add(1,new Double(qtyStd));
}
detQty = ((Double)qty.get(0)).doubleValue();
conv = ((Double)qty.get(1)).doubleValue();
detQty = ((Double)qty.get(1)).doubleValue();
conv = ((Double)qty.get(0)).doubleValue();
System.out.println("conv :"+conv);
......@@ -2054,16 +2088,18 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
}
dimension = genericUtility.getColumnValueFromNode("dimension",currDetail);
dimension = (dimension == null ? "": dimension );
System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString()));
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(0)).append("]]>").append("</quantity>\r\n");
//valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString()));
//setNodeValue( dom, "quantity", (qty.get(0)));
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
setNodeValue( dom, "quantity_real",qtyStd );
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
//valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd );
valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n");
//valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString())));
//setNodeValue( dom, "quantity", (qty.get(0)));
//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
//setNodeValue( dom, "quantity_real",qtyStd );
//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity_real>\r\n");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity / noArt).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty", (quantity / noArt));
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
......@@ -2087,10 +2123,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
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);
System.out.println("manohar 15/10/10 no_art from packlist [" + noArt + "]");
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");
setNodeValue( dom, "dimension", (dimension == null) ? "":dimension );
//valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append((dimension == null) ? "":dimension).append("]]>").append("</dimension>\r\n");
//setNodeValue( dom, "dimension", (dimension == null) ? "":dimension );
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append((taxClass == null) ? "":taxClass).append("]]>").append("</tax_class>\r\n");
setNodeValue( dom, "tax_class", (taxClass == null) ? "":taxClass );
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append((taxChap == null) ? "":taxChap).append("]]>").append("</tax_chap>\r\n");
......@@ -2098,6 +2135,22 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
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 );
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString()));
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd );
valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString())));
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
valueXmlString.append(getChangeSord(dom , dom1 , "lot_sl", xtraParams , conn));
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString()));
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd );
valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString())));
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
// Change 07-09-10
sql =" select retest_date , mfg_date , exp_date from stock where item_code = ? and "
......@@ -3098,7 +3151,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
String rateOpt = "";
String rateUnitSord = "";
String custCode = "";
String packCode = "";
String packCode = "", tempStr = "";
String sqlTemp ="",qtyDetailStr = "";
String despatchId = "";
String taxClass = "";
......@@ -4229,8 +4282,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<site_code isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeDet).append("]]>").append("</site_code>\r\n");
setNodeValue( dom, "site_code", (siteCodeDet == null) ? "":siteCodeDet );
//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity_real>\r\n");
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(OrdQty).append("]]>").append("</quantity_real>\r\n");
setNodeValue( dom, "quantity_real", OrdQty);
//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(OrdQty).append("]]>").append("</quantity_real>\r\n");
//setNodeValue( dom, "quantity_real", OrdQty);
valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit1).append("]]>").append("</unit>\r\n");
setNodeValue( dom, "unit", (unit1 == null) ? "":unit1 );
valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(unitStd1).append("]]>").append("</unit__std>\r\n");
......@@ -4243,8 +4296,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode );
System.out.println("28/08/10 packQty 2 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty", packQty );
//----valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
//----setNodeValue( dom, "pack_qty", packQty );
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity__stduom>\r\n");
//System.out.println( "RATE__STDUOM :: " + rateStduom );
......@@ -4256,12 +4309,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyOrd).append("]]>").append("</pending_qty>\r\n");
// start change 10-08-10 grossWeight = grossWeight2
valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight2).append("]]>").append("</gross_weight>\r\n");
setNodeValue( dom, "gross_weight", grossWeight2 );
valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight2).append("]]>").append("</nett_weight>\r\n");
setNodeValue( dom, "nett_weight", netWeight2 );
valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight2).append("]]>").append("</tare_weight>\r\n");
setNodeValue( dom, "tare_weight", tareWeight2 );
//----valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight2).append("]]>").append("</gross_weight>\r\n");
//----setNodeValue( dom, "gross_weight", grossWeight2 );
//----valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight2).append("]]>").append("</nett_weight>\r\n");
//----setNodeValue( dom, "nett_weight", netWeight2 );
//----valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight2).append("]]>").append("</tare_weight>\r\n");
//----setNodeValue( dom, "tare_weight", tareWeight2 );
// end change 10-08-10
valueXmlString.append("<pallet_wt isSrvCallOnChg='0'>").append("<![CDATA[").append(palletWt).append("]]>").append("</pallet_wt>\r\n");
setNodeValue( dom, "pallet_wt", palletWt );
......@@ -4271,6 +4324,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<site_code__mfg isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeMfg).append("]]>").append("</site_code__mfg>\r\n");
setNodeValue( dom, "site_code__mfg", (siteCodeMfg == null) ? "":siteCodeMfg );
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity>\r\n"); // chg6 01-08-10
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity_real>\r\n");
setNodeValue( dom, "quantity_real", qtyFact.get(1).toString());
//valueXmlString.append("<quantity isSrvCallOnChg='1'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity>\r\n");
System.out.println( "lot No 1 :: " + lotNo );
......@@ -4291,18 +4346,25 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append((taxChap == null) ?"":taxChap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ?"":taxEnv).append("]]>").append("</tax_env>\r\n");
// 18-08 change
lineNoOrd = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg4
valueXmlString.append(lineNoOrd);
expLev = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn); // chg5
valueXmlString.append(expLev);
lotNo = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg7 16-08
valueXmlString.append(lotNo);
lotSl = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg8 16-08
valueXmlString.append(lotSl);
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg4
valueXmlString.append(tempStr);
tempStr = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn); // chg5
valueXmlString.append(tempStr);
// 15/11/10
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity>\r\n"); // chg6 01-08-10
setNodeValue( dom, "quantity", qtyFact.get(1).toString() );
// 15/11/10
tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg7 16-08
valueXmlString.append(tempStr);
//tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg8 16-08
valueXmlString.append(tempStr);
//end change
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity>\r\n"); // chg6 01-08-10
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity_real>\r\n"); // chg6 01-08-10
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity__stduom>\r\n");
valueXmlString.append("</Detail>\r\n");
// End Addition - Piyush - 24/12/07
System.out.println( "Ic Str shb :: " + valueXmlString.toString() );
System.out.println( "manohar 28/10/10 final string :: " + valueXmlString.toString() );
qtyOrd = qtyOrd - qtyStd;
qtyOrd = df.parse(df.format(qtyOrd)).doubleValue();// Added - Gukzar - 23/01/08
System.out.println("Quentity Pending: " + qtyOrd); // Added - Gukzar - 23/01/08
......@@ -4416,15 +4478,18 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<site_code__mfg isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeMfg).append("]]>").append("</site_code__mfg>\r\n");
setNodeValue( dom, "site_code__mfg", (siteCodeMfg == null) ? "":siteCodeMfg );
///
lineNoOrd = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg9
valueXmlString.append(lineNoOrd);
expLev = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn); // chg9
valueXmlString.append(expLev);
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg9
valueXmlString.append(tempStr);
tempStr = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn); // chg9
valueXmlString.append(tempStr);
valueXmlString.append(getChangeSord(dom, dom1, "quantity", xtraParams ,conn)); // chg10
lotNo = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg11 16-08
valueXmlString.append(lotNo);
lotSl = getChangeSord(dom, dom1, "lot_sl", xtraParams ,conn); // chg12 16-08
valueXmlString.append(lotSl);
tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); // chg11 16-08
valueXmlString.append(tempStr);
tempStr = getChangeSord(dom, dom1, "lot_sl", xtraParams ,conn); // chg12 16-08
valueXmlString.append(tempStr);
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity_real>\r\n");
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty * convQtyStduom).append("]]>").append("</quantity__stduom>\r\n");
/*
valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduomrt).append("]]>").append("</rate__stduom>\r\n");
......@@ -4677,7 +4742,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<gross_weight>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<nett_weight>").append("<![CDATA[").append(netWeight).append("]]>").append("</nett_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(blanknull(dimension)).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append(suppCodeMfg).append("]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<mfg_date>").append("<![CDATA[").append(mfgDate).append("]]>").append("</mfg_date>\r\n");
valueXmlString.append("<exp_date>").append("<![CDATA[").append(expDate).append("]]>").append("</exp_date>\r\n");
......@@ -4941,7 +5006,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
ResultSet rs=null;
Connection conn=null;
String sql=null;
String lineNo = "";
String lineNo = "", tempStr = "";
String locCode = "",lotNo = "",lotSl = "";
try
......@@ -4986,15 +5051,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'><![CDATA[").append(lineNo).append("]]></line_no__sord>\r\n");
setNodeValue( dom, "line_no__sord", (lineNo == null) ? "":lineNo );
lineNo = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg13
valueXmlString.append(lineNo);
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg13
valueXmlString.append(tempStr);
valueXmlString.append("<item_code isSrvCallOnChg='0'><![CDATA[").append(itemCode).append("]]></item_code>");
valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append(itemDescr).append("</item_descr>");
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(quantity).append("</quantity>");
setNodeValue( dom, "quantity", quantity);
quantity = getChangeSord(dom, dom1, "quantity", xtraParams ,conn); // chg14
valueXmlString.append(quantity);
tempStr = getChangeSord(dom, dom1, "quantity", xtraParams ,conn); // chg14
valueXmlString.append(tempStr);
valueXmlString.append("<loc_code>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(lotNo).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(lotSl).append("]]>").append("</lot_sl>\r\n");
......@@ -5095,7 +5160,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
NodeList detailList = null;
String sql = "", errString = "", newMessage = "";
String tranIdInvpack = "", custCode = "", itemCode = "", siteCode = "", locCode = "", lotSl = "", lotNo = "";
String saleOrder = "", lineNoSord = "", expLevel = "", detailCnt = "";
String saleOrder = "", lineNoSord = "", expLevel = "", detailCnt = "", tempStr = "";
double invPackQty = 0, pendQty = 0, despQty = 0, qtyAlloc = 0, availQty = 0, stkAllocQty = 0;
int detCnt = 0;
StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
......@@ -5225,16 +5290,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNoSord).append("]]>").append("</line_no__sord>");
setNodeValue( dom, "line_no__sord", (lineNoSord == null) ? "":lineNoSord );
lineNoSord = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg15
valueXmlString.append(lineNoSord);
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn); // chg15
valueXmlString.append(tempStr);
valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLevel).append("]]>").append("</exp_lev>");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(lotNo).append("]]>").append("</lot_no>");
valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(lotSl).append("]]>").append("</lot_sl>");
setNodeValue( dom, "lot_sl", (lotSl == null) ? "":lotSl );
lotSl = getChangeSord(dom, dom1, "lot_sl", xtraParams ,conn); // chg16
valueXmlString.append(lotSl);
tempStr = getChangeSord(dom, dom1, "lot_sl", xtraParams ,conn); // chg16
valueXmlString.append(tempStr);
valueXmlString.append("<quantity protect = \"1\" isSrvCallOnChg='0'>").append("<![CDATA[").append(despQty).append("]]>").append("</quantity>");
setNodeValue( dom, "quantity", despQty);
......@@ -5597,8 +5662,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
int ctr=0;
String childNodeName = null;
String columnValue = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null,rs1 = null;
String mcode = "", mVal = "" , sql = "" ;
String siteCodeDet = "",taxcl = "", taxch = "", taxen = "", mdiscount = "" ;
String custItemCodeRef ="",itemCode ="";
......@@ -5900,10 +5965,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n");
//setNodeValue( dom, "rate__stduom", mNum3); /// 16-08
sNoArticle = genericUtility.getColumnValue("no_art",dom);
if (sNoArticle == null || "null".equals(sNoArticle))
/*if (sNoArticle == null || "null".equals(sNoArticle))
{
sNoArticle = "1";
}
}*/
if(sNoArticle != null && sNoArticle.trim().length() > 0)
{
......@@ -6071,7 +6136,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
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");
valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(mpack)).append("]]>").append("</pack_instr>\r\n");
setNodeValue( dom, "pack_instr", (mpack == null) ? "" : mpack );
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(mnopack).append("]]>").append("</no_art>\r\n");
setNodeValue( dom, "no_art", mnopack );
......@@ -6241,10 +6306,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n");
//setNodeValue( dom, "rate__stduom", mNum3); /// 16-08
sNoArticle = genericUtility.getColumnValue("no_art",dom);
if(sNoArticle == null || "null".equals(sNoArticle) || "0".equals(sNoArticle))
/*if(sNoArticle == null || "null".equals(sNoArticle) || "0".equals(sNoArticle))
{
sNoArticle = "1";
}
}*/
if(sNoArticle != null && sNoArticle.trim().length() > 0)
{
noArticle = Double.parseDouble(sNoArticle);
......@@ -6609,6 +6674,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.close();
pstmt = null;
noArt = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'B',acShipperQty,acIntQty ,conn);
System.out.println("manohar 15/10/10 noArt from distCommon [" + noArt + "]");
//noArt = gf_get_no_art(ls_site_code_det,ls_cust_code,itemCode,ls_pack_code,mNum,'B',ac_shipper_qty,ac_int_qty) //miss15 function
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
setNodeValue( dom, "no_art", noArt );
......@@ -6828,54 +6894,52 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(5,lotSl);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
grossWeight = rs.getDouble(1);
nettWeight = rs.getDouble(2);
tareWeight = rs.getDouble(3);
qtyPerArt = rs.getDouble(4);
packInstr = rs.getString(5);
dimension = rs.getString(6);
dimension = (dimension == null ? "": dimension );
stcrate = rs.getDouble(7);
grossWeightArt = rs.getDouble(8);
tareWeightArt = rs.getDouble(9);
expDate = rs.getTimestamp(10);
mfgDate = rs.getTimestamp(11);
siteMfg = rs.getString(12);
palletWt = rs.getDouble(13);
retestDate = rs.getTimestamp(14);
qty1 = rs.getDouble(15);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//if(qty1 == 0.0 )
// {
//smNum = genericUtility.getColumnValue("quantity", dom);
//qty1 = rs.getDouble(15);
if(smNum != null && smNum.trim().length() > 0)
{
mNum = Double.parseDouble(smNum);
}
qty1 = mNum;
//}*/
System.out.println("quantity :"+mNum);
sNoArt = genericUtility.getColumnValue(" no_art",dom);
sNoArt = genericUtility.getColumnValue("no_art",dom);
if(sNoArt != null && sNoArt.trim().length() > 0)
{
noArt = Double.parseDouble(sNoArt);
}
else
{
noArt = 1;
}
if(noArt == 0)
{
if(qtyPerArt > 0)
/*if(qtyPerArt > 0)
{
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(Math.round(mNum/qtyPerArt)).append("]]>").append("</no_art>\r\n");
setNodeValue( dom, "no_art", (Math.round(qty1/qtyPerArt)));
}*/
}
}
//qtyPerArt =0;//
//qtyPerArt = 0;//
if(qtyPerArt == 0)
{
qtyPerArt = 1;
......@@ -6887,21 +6951,34 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
tareWeight = df.parse(df.format(tareWeight)).doubleValue();
nettWeight = grossWeight - tareWeight ;
nettWeight = df.parse(df.format(nettWeight)).doubleValue();
System.out.println("28/10/10 manohar before qty1 [" + qty1 + "] qtyPerArt {" + qtyPerArt +"] no_art [" + noArt + "] grossWeight [" + grossWeight + "] tareWeight [" + tareWeight + "] nettWeight [" + nettWeight +"]");
noArt = qty1 / qtyPerArt;
noArt = getReqDecimal(noArt, 0);
grossWeight = (grossWeightArt * noArt);///qtyPerArt) * qty1;
grossWeight = df.parse(df.format(grossWeight)).doubleValue();
tareWeight = (tareWeightArt * noArt); ///qtyPerArt) * qty1;
tareWeight = df.parse(df.format(tareWeight)).doubleValue();
nettWeight = grossWeight - tareWeight ;
nettWeight = df.parse(df.format(nettWeight)).doubleValue();
System.out.println("28/10/10 manohar after qty1 [" + qty1 + "] qtyPerArt {" + qtyPerArt +"] no_art [" + noArt + "] grossWeight [" + grossWeight + "] tareWeight [" + tareWeight + "] nettWeight [" + nettWeight +"]");
sql = "select stk_opt ,(case when track_shelf_life is null then 'N' else track_shelf_life end) "
+" from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
rs = pstmt.executeQuery();
while(rs.next())
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
stkOpt = rs.getString(1);
trackShelfLife = rs.getString(2);
stkOpt = rs1.getString(1);
trackShelfLife = rs1.getString(2);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
if(expDate != null)
{
sExpDate = sdf.format(expDate).toString();
......@@ -6945,19 +7022,19 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if(packInstr == null || packInstr.trim().length() == 0)
{
sql = "select pack_instr from sorddet where sale_order = ? and line_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleord);
pstmt.setString(2,saleordLine);
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,saleord);
pstmt1.setString(2,saleordLine);
rs = pstmt.executeQuery();
while(rs.next())
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
packInstr = rs.getString("pack_instr");
packInstr = rs1.getString("pack_instr");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
valueXmlString.append("<pallet_wt isSrvCallOnChg='0'>").append("<![CDATA[").append(palletWt).append("]]>").append("</pallet_wt>\r\n");
setNodeValue( dom, "pallet_wt", palletWt );
......@@ -6967,10 +7044,18 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "nett_weight", nettWeight );
valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
setNodeValue( dom, "tare_weight", tareWeight );
valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(packInstr).append("]]>").append("</pack_instr>\r\n");
setNodeValue( dom, "pack_instr", (packInstr == null) ? "" : packInstr );
valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
setNodeValue( dom, "dimension", (dimension == null) ? "" : dimension );
valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(packInstr)).append("]]>").append("</pack_instr>\r\n");
setNodeValue( dom, "pack_instr", (packInstr == null) ? " " : packInstr );
valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(dimension)).append("]]>").append("</dimension>\r\n");
setNodeValue( dom, "dimension", (dimension == null) ? " " : dimension );
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
setNodeValue( dom, "no_art", (noArt));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sRateStd = genericUtility.getColumnValue("rate__stduom",dom);
if(sRateStd != null && sRateStd.trim().length() > 0)
{
......@@ -6989,7 +7074,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(2,saleordLine);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
sordRate = rs.getDouble(1);
sordExcRate = rs.getDouble(2);
......@@ -7014,7 +7099,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(3,explev);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
nature =rs.getString("nature");
}
......@@ -7029,10 +7114,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(1,saleord);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
priceList =rs.getString("price_list");
priceListClg =rs.getString("price_list__clg");
priceList = rs.getString("price_list");
priceListClg = rs.getString("price_list__clg");
}
rs.close();
rs = null;
......@@ -7096,7 +7181,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(1,priceList);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
count =rs.getInt(1);
}
......@@ -7116,7 +7201,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.setString(1,priceList);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
priceListParent =rs.getString("price_list__parent");
}
......@@ -7131,7 +7216,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if("B".equalsIgnoreCase(listType))
{
pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"B",sordQuantity , conn); //miss23 function
//pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"B",sordQuantity , conn); //miss23 function
pickRate = distCommon.pickRate(priceList,sDespDate,itemCode,lotNo,"B",sordQuantity, conn);
System.out.println("pickRate :"+pickRate);
}
else
......@@ -7142,7 +7228,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
}
else if(count > 0)
{
pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"I",sordQuantity , conn);
//pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"I",sordQuantity , conn);
pickRate = distCommon.pickRate(priceList,sDespDate,itemCode,lotNo,"I",sordQuantity, conn);
System.out.println("count >0 pickRate :"+pickRate);
}
......@@ -7173,7 +7260,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if(priceListClg !=null && priceListClg.trim().length() > 0)
{
pickRateClg = distCommon.pickRateGSM(priceListClg,sDespDate,itemCode,lotNo,"B",sordQuantity , conn);
//pickRateClg = distCommon.pickRateGSM(priceListClg,sDespDate,itemCode,lotNo,"B",sordQuantity , conn);
pickRateClg = distCommon.pickRate(priceListClg,sDespDate,itemCode,lotNo,"B",sordQuantity, conn);
valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(pickRateClg).append("]]>").append("</rate__clg>\r\n");
setNodeValue( dom, "rate__clg", pickRateClg );
......@@ -7215,7 +7303,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA[").append('F').append("]]>").append("</line_type>\r\n");
setNodeValue( dom, "line_type", 'F' );
}
valueXmlString.append(getChangeSord(dom , dom1 , "quantity", xtraParams , conn)); /// 17-08-10
//valueXmlString.append(getChangeSord(dom , dom1 , "quantity", xtraParams , conn)); /// 17-08-10
// }
}
......@@ -7277,5 +7365,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, nodeName, Integer.toString( nodeVal ) );
}
public double getReqDecimal(double actVal, int prec)
{
String fmtStr = "############0";
String strValue = null;
if (prec > 0)
{
fmtStr = fmtStr + "." + "000000000".substring(0, prec);
}
DecimalFormat decFormat = new DecimalFormat(fmtStr);
return Double.parseDouble(decFormat.format(actVal));
}
}
\ No newline at end of file
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