Commit 7b673b12 authored by manohar's avatar manohar

allocate and all item button no_art set


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93783 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bf3aa0da
......@@ -602,7 +602,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
String allocDate = "", partQuantity = "", errCode = "", errString = "", sql = "", retResult = "";
String acctCodeInv = "", cctrCodeInv = "", sql1 = "";
String validateStr = "",lotSerial = "";
double remainingQty = 0d, inputQty = 0d;
double remainingQty = 0d, inputQty = 0d, qtyPerArt = 0, noArt = 0;
int minShelfLife = 0, noOfStkDet = 0;
String trackShelfLife = "", chkDate = "";
ArrayList acctCodeInvArrLst = new ArrayList();
......@@ -803,7 +803,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
// join the location master loc_code with stock loc_code
sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
+"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, "
+"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE "
+"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE, a.qty_per_art as QTY_PER_ART "
+"FROM STOCK A, LOCATION L, INVSTAT B "
+"WHERE L.LOC_CODE = A.LOC_CODE "
+ " AND L.INV_STAT = B.INV_STAT "
......@@ -820,7 +820,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
+"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, "
+"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE "
+"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE, a.qty_per_art as QTY_PER_ART "
+"FROM STOCK A, LOCATION L, INVSTAT B "
+"WHERE L.LOC_CODE = A.LOC_CODE "
+ " AND L.INV_STAT = B.INV_STAT "
......@@ -860,6 +860,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
lotNum = rs.getString(1);
locCode1 = rs.getString(12);
lotSerial = rs.getString(2);
qtyPerArt = rs.getDouble("QTY_PER_ART"); // 17/10/13 manoharan to calculate no_art
System.out.print("Combination Key : "+itemCode+"~"+siteCodeReq+"~"+locCode1+"~"+lotNum + "~" + lotSerial);
hmQty = Double.parseDouble((hm.get(itemCode+"~"+siteCodeReq+"~"+locCode1+"~"+lotNum + "~" + lotSerial)).toString());
System.out.println(" ::Value [hmQty] :: "+hmQty);
......@@ -983,13 +984,29 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
//changed by ALKA on 11/09/07 for no_art column added in the consume_iss_det and itemChange enabled for lot_no for request id "DI78GIN041"
//valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg=\"0\">").append("<![CDATA[").append(rs.getString(2)).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<lot_no isSrvCallOnChg='1'>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<conv_qty_stduom isSrvCallOnChg=\"0\">").append("<![CDATA[").append(1).append("]]>").append("</conv_qty_stduom>\r\n");
valueXmlString.append("<acct_code isSrvCallOnChg=\"0\">").append("<![CDATA[").append((acctCode == null) ? "":acctCode).append("]]>").append("</acct_code>\r\n");
valueXmlString.append("<cctr_code isSrvCallOnChg=\"0\">").append("<![CDATA[").append(cctrCode).append("]]>").append("</cctr_code>\r\n");
valueXmlString.append("<tax_chap isSrvCallOnChg=\"0\">").append("<![CDATA[").append((taxChap == null) ? "":taxChap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_class isSrvCallOnChg=\"0\">").append("<![CDATA[").append((taxClass == null) ? "":taxClass).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_env isSrvCallOnChg=\"0\">").append("<![CDATA[").append((taxEnv == null) ? "":taxEnv).append("]]>").append("</tax_env>\r\n");
// 17/10/13 Manoharan set no_art
noArt = inputQty / qtyPerArt;
System.out.println("Manohar 17/10/13 before noArt [" + noArt + "] Math.floor(noArt) [" + Math.floor(noArt) + "]");
if ( (noArt - Math.floor(noArt) ) != 0 )
{
noArt = Math.floor(noArt + 0.5d);
}
else
{
noArt = Math.floor(noArt);
}
System.out.println("Manohar 17/10/13 after noArt [" + noArt + "]");
System.out.println("rs.getString(13) :"+rs.getString(13)+" \nrs.getString(14) :"+rs.getString(14));
if ((rs.getString(13) == null || rs.getString(13).trim().length() == 0) || (rs.getString(14) == null || rs.getString(14).trim().length() == 0))
{
......@@ -1027,6 +1044,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
{
valueXmlString.append("<cctr_code__inv isSrvCallOnChg=\"0\">").append("<![CDATA[").append(rs.getString(14)).append("]]>").append("</cctr_code__inv>\r\n");
}
valueXmlString.append("<no_art isSrvCallOnChg=\"0\">").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
valueXmlString.append("</Detail>\r\n");
}// while end
/*if (noOfStkDet == 0)
......
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