Commit a2508ac6 authored by manohar's avatar manohar

no_art setting changed, value passed was wrong to setNoArt method


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96397 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 792cd9ef
...@@ -955,7 +955,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -955,7 +955,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
grossWeight = (String)noArtDetArrLst.get(0); grossWeight = (String)noArtDetArrLst.get(0);
System.out.println("grossWeight ["+grossWeight + "]"); System.out.println("grossWeight ["+grossWeight + "]");
tareWeight = (String)noArtDetArrLst.get(1); tareWeight = (String)noArtDetArrLst.get(1);
System.out.println("tareWeight ["+tareWeight + "]); System.out.println("tareWeight ["+tareWeight + "]");
netWeight = (String)noArtDetArrLst.get(2); netWeight = (String)noArtDetArrLst.get(2);
System.out.println("netWeight ["+netWeight + "]"); System.out.println("netWeight ["+netWeight + "]");
noArtStr = (String)noArtDetArrLst.get(3); noArtStr = (String)noArtDetArrLst.get(3);
...@@ -1056,9 +1056,9 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1056,9 +1056,9 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
lotNo = genericUtility.getColumnValue("lot_no", dom); lotNo = genericUtility.getColumnValue("lot_no", dom);
lotSl = genericUtility.getColumnValue("lot_sl", dom); lotSl = genericUtility.getColumnValue("lot_sl", dom);
quantity = Double.parseDouble(genericUtility.getColumnValue("quantity", dom)); quantity = Double.parseDouble(genericUtility.getColumnValue("quantity", dom));
System.out.println("Manohar 14/03/12 quantity [" + quantity + "]"); //System.out.println("Manohar 14/03/12 quantity [" + quantity + "]");
expLev = genericUtility.getColumnValue("exp_lev", dom); expLev = genericUtility.getColumnValue("exp_lev", dom);
System.out.println("expLev ::: " + expLev); //System.out.println("expLev ::: " + expLev);
reasCode = genericUtility.getColumnValue("reas_code", dom); reasCode = genericUtility.getColumnValue("reas_code", dom);
calcPotency = genericUtility.getColumnValue("calc_potency", dom); calcPotency = genericUtility.getColumnValue("calc_potency", dom);
tranType = genericUtility.getColumnValue("tran_type", dom1); tranType = genericUtility.getColumnValue("tran_type", dom1);
...@@ -1134,7 +1134,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1134,7 +1134,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
pstmt1.setString(2, itemCodeMain); pstmt1.setString(2, itemCodeMain);
pstmt1.setString(3, itemCodeRef); pstmt1.setString(3, itemCodeRef);
System.out.println("Sql ::: " + sql); System.out.println("Sql ::: " + sql);
System.out.println("Setting param ::: bomCode :: " + bomCode + "itemCodeMain :: " + itemCodeMain + "itemCodeRef :: " + itemCodeRef); //System.out.println("Setting param ::: bomCode :: " + bomCode + "itemCodeMain :: " + itemCodeMain + "itemCodeRef :: " + itemCodeRef);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
...@@ -1237,24 +1237,24 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1237,24 +1237,24 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
rs.close(); rs.close();
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<tran_id>").append("<![CDATA[").append(woIss).append("]]>").append("</tran_id>\r\n"); valueXmlString.append("<tran_id isSrvCallOnChg='0'>").append("<![CDATA[").append(woIss).append("]]>").append("</tran_id>\r\n");
valueXmlString.append("<exp_lev>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n"); valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n");
valueXmlString.append("<item_code>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<item_descr>").append("<![CDATA[").append(itemDescr).append("]]>").append("</item_descr>\r\n"); valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(itemDescr).append("]]>").append("</item_descr>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(mfgLoc).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(mfgLoc).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(" ").append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(" ").append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(" ").append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(" ").append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<stk_opt>").append("<![CDATA[").append(1).append("]]>").append("</stk_opt>\r\n"); valueXmlString.append("<stk_opt isSrvCallOnChg='0'>").append("<![CDATA[").append(1).append("]]>").append("</stk_opt>\r\n");
valueXmlString.append("<reas_code>").append("<![CDATA[").append(reasCode).append("]]>").append("</reas_code>\r\n"); valueXmlString.append("<reas_code isSrvCallOnChg='0'>").append("<![CDATA[").append(reasCode).append("]]>").append("</reas_code>\r\n");
if (tranType.equalsIgnoreCase("F")) if (tranType.equalsIgnoreCase("F"))
{ {
valueXmlString.append("<unit__alt>").append("<![CDATA[").append(unitAlt).append("]]>").append("</unit__alt>\r\n"); valueXmlString.append("<unit__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(unitAlt).append("]]>").append("</unit__alt>\r\n");
valueXmlString.append("<conv__qty__alt>").append("<![CDATA[").append(convQtyAlt).append("]]>").append("</conv__qty__alt>\r\n"); valueXmlString.append("<conv__qty__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(convQtyAlt).append("]]>").append("</conv__qty__alt>\r\n");
valueXmlString.append("<quantity__alt>").append("<![CDATA[").append(qtyAlt).append("]]>").append("</quantity__alt>\r\n"); valueXmlString.append("<quantity__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyAlt).append("]]>").append("</quantity__alt>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append("1S").append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append("1S").append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA[").append("1").append("]]>").append("</no_art>\r\n"); valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append("1").append("]]>").append("</no_art>\r\n");
} }
} }
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
...@@ -1276,7 +1276,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1276,7 +1276,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
quantity = quantity + potencyAdjQty; quantity = quantity + potencyAdjQty;
} }
} }
System.out.println("Manohar quantity 2 [" + quantity + "]" ); System.out.println("22/09/14 Manohar quantity 2 [" + quantity + "]" );
if (lotNo != null && lotNo.trim().length() > 0) if (lotNo != null && lotNo.trim().length() > 0)
{ {
if (lotSl == null && lotSl.trim().length() == 0) if (lotSl == null && lotSl.trim().length() == 0)
...@@ -1573,23 +1573,23 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1573,23 +1573,23 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
System.out.println("final inputQty3 :: ["+inputQty+"]"); System.out.println("final inputQty3 :: ["+inputQty+"]");
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<tran_id>").append("<![CDATA[").append(woIss).append("]]>").append("</tran_id>\r\n"); valueXmlString.append("<tran_id isSrvCallOnChg='0'>").append("<![CDATA[").append(woIss).append("]]>").append("</tran_id>\r\n");
valueXmlString.append("<exp_lev>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n"); valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n");
valueXmlString.append("<item_code>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<item_descr>").append("<![CDATA[").append(itemDescr).append("]]>").append("</item_descr>\r\n"); valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(itemDescr).append("]]>").append("</item_descr>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
valueXmlString.append("<unit__alt>").append("<![CDATA[").append(unit).append("]]>").append("</unit__alt>\r\n"); valueXmlString.append("<unit__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit__alt>\r\n");
valueXmlString.append("<conv__qty__alt>").append("<![CDATA[").append("1.0").append("]]>").append("</conv__qty__alt>\r\n"); valueXmlString.append("<conv__qty__alt isSrvCallOnChg='0'>").append("<![CDATA[").append("1.0").append("]]>").append("</conv__qty__alt>\r\n");
valueXmlString.append("<quantity__alt>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity__alt>\r\n"); valueXmlString.append("<quantity__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity__alt>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(stkLocCode).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLocCode).append("]]>").append("</loc_code>\r\n");
// 22/04/10 manoharan empty value gives box char // 22/04/10 manoharan empty value gives box char
stkLotNo = (stkLotNo == null ? "" : stkLotNo); stkLotNo = (stkLotNo == null ? "" : stkLotNo);
stkLotSl = (stkLotSl == null ? "" : stkLotSl); stkLotSl = (stkLotSl == null ? "" : stkLotSl);
// end 22/04/10 manoharan empty value gives box char // end 22/04/10 manoharan empty value gives box char
valueXmlString.append("<lot_no>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<reas_code>").append("<![CDATA[").append(reasCode).append("]]>").append("</reas_code>\r\n"); valueXmlString.append("<reas_code isSrvCallOnChg='0'>").append("<![CDATA[").append(reasCode).append("]]>").append("</reas_code>\r\n");
if (inputQty > 0) if (inputQty > 0)
{ {
sql = " SELECT ROUND((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) / " sql = " SELECT ROUND((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) / "
...@@ -1627,7 +1627,9 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1627,7 +1627,9 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
// (expLev != null) && (inputQty != 0) && (tranType != null) ) //CHANGED BY ALKA 19/07/07 AS WEIGHT DATA IS NOT DISPLAYED IN THE DETAIL // (expLev != null) && (inputQty != 0) && (tranType != null) ) //CHANGED BY ALKA 19/07/07 AS WEIGHT DATA IS NOT DISPLAYED IN THE DETAIL
//{ //{
gWeight = Double.parseDouble(genericUtility.getColumnValue("gross_weight", dom)); gWeight = Double.parseDouble(genericUtility.getColumnValue("gross_weight", dom));
retNoArt = setNoArt(siteCode, itemCode, locCode, lotNo, lotSl, expLev, inputQty,tranType, gWeight, conn);
retNoArt = setNoArt(siteCode, itemCode, stkLocCode, stkLotNo, stkLotSl, expLev, inputQty,tranType, gWeight, conn);
noArtDetArrLst = genericUtility.getTokenList(retNoArt, ":"); noArtDetArrLst = genericUtility.getTokenList(retNoArt, ":");
System.out.println("2nd noArtDetArrLst.size ["+noArtDetArrLst.size() + "]"); System.out.println("2nd noArtDetArrLst.size ["+noArtDetArrLst.size() + "]");
...@@ -1635,7 +1637,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1635,7 +1637,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
grossWeight = (String)noArtDetArrLst.get(0); grossWeight = (String)noArtDetArrLst.get(0);
System.out.println("grossWeight ["+grossWeight + "]"); System.out.println("grossWeight ["+grossWeight + "]");
tareWeight = (String)noArtDetArrLst.get(1); tareWeight = (String)noArtDetArrLst.get(1);
System.out.println("tareWeight ["+tareWeight + "]); System.out.println("tareWeight ["+tareWeight + "]");
netWeight = (String)noArtDetArrLst.get(2); netWeight = (String)noArtDetArrLst.get(2);
System.out.println("netWeight ["+netWeight + "]"); System.out.println("netWeight ["+netWeight + "]");
noArtStr = (String)noArtDetArrLst.get(3); noArtStr = (String)noArtDetArrLst.get(3);
...@@ -1764,11 +1766,11 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1764,11 +1766,11 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
rs.close(); rs.close();
if ("W".equals(criteria)) if ("W".equals(criteria))
{ {
valueXmlString.append("<quantity>").append("<![CDATA[").append(stockQuantity).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(stockQuantity).append("]]>").append("</quantity>\r\n");
} }
else else
{ {
valueXmlString.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
} }
if (quantity > 0) if (quantity > 0)
{ {
...@@ -1797,7 +1799,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1797,7 +1799,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
noArt = quantity/perArtQty; noArt = quantity/perArtQty;
} }
valueXmlString.append("<no_art>").append("<![CDATA[").append(Math.round(noArt)).append("]]>").append("</no_art>\r\n"); valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(Math.round(noArt)).append("]]>").append("</no_art>\r\n");
} }
pstmt1.close(); pstmt1.close();
rs1.close(); rs1.close();
......
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