Skip to content

B
business-java
Commit 6c0a3e0f authored by kmandhre's avatar kmandhre
Browse files
Options

change for grossWeight,tareWeight,nettWeight calculation SCM issue tracker 169-N 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94137 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ba3bf74a
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 5 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ 6c0a3e0f
......@@ -1379,7 +1379,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
/* commented on 03/02/11 - Chandni Shah
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
*/
valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append(icQtyOrd).append("</pending_qty>");
//System.out.println("kunal test 1382..");
//comment <pending_qty> by kunal on 16/jan/13 pending_qty set in exp_lev itemchange
//valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append(icQtyOrd).append("</pending_qty>");
//valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n");
//valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight).append("]]>").append("</nett_weight>\r\n");
//valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
......@@ -7246,10 +7248,23 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
}
shipperQty = acShipperQty;
intQty = acIntQty;
noArt1 = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'S',acShipperQty,acIntQty ,conn);
ArrayList list = new ArrayList();
//change by kunal on 15/jan/14 change for SCM issue tracker 169-N set correct Qty details
//noArt1 = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'S',acShipperQty,acIntQty ,conn);
list = distCommon.getNoArtAList(siteCodeDet,custCode,itemCode,packCode,mNum,'S',acShipperQty,acIntQty ,conn);
System.out.println("kunal test 7252::"+list.toString());
noArt1 = Double.parseDouble((String)list.get(0)) ;
acShipperQty = Double.parseDouble((String)list.get(1)) ;
acIntQty = Double.parseDouble((String)list.get(2)) ;
balQty = mNum - (shipperQty * noArt1);
noArt2 = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'S',acShipperQty,acIntQty ,conn);
//noArt2 = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'S',acShipperQty,acIntQty ,conn);
list = distCommon.getNoArtAList(siteCodeDet,custCode,itemCode,packCode,balQty,'I',acShipperQty,acIntQty ,conn);
System.out.println("kunal test 7260::"+list.toString());
noArt2 = Double.parseDouble((String)list.get(0)) ;
//noArt2 = 1;
acShipperQty = Double.parseDouble((String)list.get(1)) ;
acIntQty = Double.parseDouble((String)list.get(2)) ;
intQty = acIntQty;
shipperQty = shipperQty * noArt1;
......@@ -7381,7 +7396,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
lotSl = genericUtility.getColumnValue("lot_sl",dom);
saleord = genericUtility.getColumnValue("sord_no",dom);
saleordLine = genericUtility.getColumnValue("line_no__sord",dom);
smNum = genericUtility.getColumnValue("quantity__stduom", dom);
smNum = genericUtility.getColumnValue("quantity", dom);
System.out.println("lot_no AND lot_sl....:"+itemCode+"..."+siteCode+"..."+locCode+"..."+lotNo+"..."+lotSl+"..."+saleord+"..."+ saleordLine +"..QUANTITY"+smNum);
if(itemCode == null)
{
......@@ -7485,6 +7500,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("28/10/10 manohar before qty1 [" + qty1 + "] qtyPerArt {" + qtyPerArt +"] no_art [" + noArt + "] grossWeight [" + grossWeight + "] tareWeight [" + tareWeight + "] nettWeight [" + nettWeight +"]");
//comment by kunal on 15/jan/14 change for grossWeight,tareWeight,nettWeight calculation SCM issue tracker 169-N
/*
noArt = qty1 / qtyPerArt;
noArt = getReqDecimal(noArt, 0);
grossWeight = (grossWeightArt * noArt);///qtyPerArt) * qty1;
......@@ -7492,7 +7509,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
tareWeight = (tareWeightArt * noArt); ///qtyPerArt) * qty1;
tareWeight = df.parse(df.format(tareWeight)).doubleValue();
nettWeight = grossWeight - tareWeight ;
nettWeight = df.parse(df.format(nettWeight)).doubleValue();
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) "
......
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