Skip to content

B
business-java
Commit 0dacdd34 authored by vkadam's avatar vkadam
Browse files
Options

Change while get data from dom remove ambiguity between LOT_NO and LOT_SL.... 

Change while get data from dom remove ambiguity between LOT_NO and LOT_SL. Also Change ActualQuantity= quantity-alloc_quantity-hold_quantity.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98456 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 94866589
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 81 deletions
webitm-mfg/ibase/webitm/ejb/mfg/ConsumptionOdrIssuWizIc.java
View file @ 0dacdd34
...@@ -77,7 +77,7 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption ...@@ -77,7 +77,7 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
String userId = ""; String userId = "";
String itemCode = ""; String itemCode = "";
String itemSer = ""; String itemSer = "";
String empCodeIss="",acctCode="",cctrCode="",projectCode="",reasonCode="",reqQty="",stkQty="",siteCodeReq="",locCode="",lotNo="",lotSl=""; String empCodeIss="",acctCode="",cctrCode="",projectCode="",reasonCode="",reqQty="",stkQty="",siteCodeReq="",locCode="",lotNo="",lotSl="",siteCode="";
String sql1=""; String sql1="";
PreparedStatement pstmt1=null; PreparedStatement pstmt1=null;
ResultSet rs1=null; ResultSet rs1=null;
...@@ -349,84 +349,113 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption ...@@ -349,84 +349,113 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
rs1.close(); rs1.close();
rs1=null; rs1=null;
} }
} siteCode=genericUtility.getColumnValue("site_code", dom1);
if(childNodeName.equalsIgnoreCase("loc_code"))
{
locCode=genericUtility.getColumnValue("loc_code", dom);
if(locCode== null || locCode.trim().length()<=0)
{
errList.add("VMALOC01");
errFields.add(childNodeName.toLowerCase());
}
else
{
sql1="select count(*) as cnt from location where loc_code=?";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1, locCode);
rs1=pstmt1.executeQuery();
if(rs1.next())
{
cnt=rs1.getInt("cnt");
}
if(cnt==0)
{
errList.add("UVEXPR");
errFields.add(childNodeName.toLowerCase());
}
pstmt1.close();
pstmt1=null;
rs1.close();
rs1=null;
}
}
if(childNodeName.equalsIgnoreCase("lot_no"))
{
lotNo=genericUtility.getColumnValue("lot_no", dom);
if(lotNo==null || lotNo.trim().length()<=0)
{
errList.add("NULLLOTNO");
errFields.add(childNodeName.toLowerCase());
}
}
if(childNodeName.equalsIgnoreCase("lot_sl"))
{
itemCode=genericUtility.getColumnValue("item_code", dom);
locCode=genericUtility.getColumnValue("loc_code", dom); locCode=genericUtility.getColumnValue("loc_code", dom);
lotNo=genericUtility.getColumnValue("lot_no", dom); lotNo=genericUtility.getColumnValue("lot_no", dom);
lotSl=genericUtility.getColumnValue("lot_sl", dom); lotSl=genericUtility.getColumnValue("lot_sl", dom);
if(lotSl==null || lotSl.trim().length()<=0)
sql1="select count(*) as cnt from stock where item_code=? and loc_code=? and lot_no=? and lot_sl=? and site_code=?";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1, checkNull(itemCode).trim());
pstmt1.setString(2, checkNull(locCode).trim());
pstmt1.setString(3, checkNull(lotNo).trim());
pstmt1.setString(4, checkNull(lotSl).trim());
pstmt1.setString(5, checkNull(siteCode).trim());
rs1=pstmt1.executeQuery();
if(rs1.next())
{ {
errList.add("VTLOTSLNLL"); cnt=rs1.getInt("cnt");
errFields.add(childNodeName.toLowerCase());
} }
else
if(cnt==0)
{ {
sql1="select count(*) as cnt from stock where item_code=? and loc_code=? and lot_no=? and lot_sl=?"; errList.add("VTRCDNTMCH");
pstmt1=conn.prepareStatement(sql1); errFields.add(childNodeName.toLowerCase());
pstmt1.setString(1, checkNull(itemCode).trim());
pstmt1.setString(2, checkNull(locCode).trim());
pstmt1.setString(3, checkNull(lotNo).trim());
pstmt1.setString(4, checkNull(lotSl).trim());
rs1=pstmt1.executeQuery();
if(rs1.next())
{
cnt=rs1.getInt("cnt");
}
if(cnt==0)
{
errList.add("VTRCDNTMCH");
errFields.add(childNodeName.toLowerCase());
}
pstmt1.close();
pstmt1=null;
rs1.close();
rs1=null;
} }
pstmt1.close();
pstmt1=null;
rs1.close();
rs1=null;
} }
// if(childNodeName.equalsIgnoreCase("loc_code"))
// {
// locCode=genericUtility.getColumnValue("loc_code", dom);
// if(locCode== null || locCode.trim().length()<=0)
// {
// errList.add("VMALOC01");
// errFields.add(childNodeName.toLowerCase());
// }
// else
// {
// sql1="select count(*) as cnt from location where loc_code=?";
// pstmt1=conn.prepareStatement(sql1);
// pstmt1.setString(1, locCode);
// rs1=pstmt1.executeQuery();
// if(rs1.next())
// {
// cnt=rs1.getInt("cnt");
// }
//
// if(cnt==0)
// {
// errList.add("UVEXPR");
// errFields.add(childNodeName.toLowerCase());
// }
//
// pstmt1.close();
// pstmt1=null;
// rs1.close();
// rs1=null;
// }
// }
// if(childNodeName.equalsIgnoreCase("lot_no"))
// {
// lotNo=genericUtility.getColumnValue("lot_no", dom);
// if(lotNo==null || lotNo.trim().length()<=0)
// {
// errList.add("NULLLOTNO");
// errFields.add(childNodeName.toLowerCase());
// }
// }
// if(childNodeName.equalsIgnoreCase("lot_sl"))
// {
// itemCode=genericUtility.getColumnValue("item_code", dom);
// locCode=genericUtility.getColumnValue("loc_code", dom);
// lotNo=genericUtility.getColumnValue("lot_no", dom);
// lotSl=genericUtility.getColumnValue("lot_sl", dom);
// if(lotSl==null || lotSl.trim().length()<=0)
// {
// errList.add("VTLOTSLNLL");
// errFields.add(childNodeName.toLowerCase());
// }
// else
// {
// sql1="select count(*) as cnt from stock where item_code=? and loc_code=? and lot_no=? and lot_sl=?";
// pstmt1=conn.prepareStatement(sql1);
// pstmt1.setString(1, checkNull(itemCode).trim());
// pstmt1.setString(2, checkNull(locCode).trim());
// pstmt1.setString(3, checkNull(lotNo).trim());
// pstmt1.setString(4, checkNull(lotSl).trim());
// rs1=pstmt1.executeQuery();
// if(rs1.next())
// {
// cnt=rs1.getInt("cnt");
// }
//
// if(cnt==0)
// {
// errList.add("VTRCDNTMCH");
// errFields.add(childNodeName.toLowerCase());
// }
//
// pstmt1.close();
// pstmt1=null;
// rs1.close();
// rs1=null;
// }
// }
if(childNodeName.equalsIgnoreCase("req_qty")) if(childNodeName.equalsIgnoreCase("req_qty"))
{ {
reqQty=genericUtility.getColumnValue("req_qty", dom); reqQty=genericUtility.getColumnValue("req_qty", dom);
...@@ -588,7 +617,7 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption ...@@ -588,7 +617,7 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
String returnValue = ""; String returnValue = "";
String getDefaultVal = ""; String getDefaultVal = "";
String available = ""; String available = "";
String itemCode="",unit="",itemSer="",locCode="",lotNo="",lotSl=""; String itemCode="",unit="",itemSer="",locCode="",lotNo="",lotSl="",siteCode="";
double quantity=0.00; double quantity=0.00;
...@@ -751,13 +780,21 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption ...@@ -751,13 +780,21 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
itemCode=genericUtility.getColumnValue("item_code", dom); itemCode=genericUtility.getColumnValue("item_code", dom);
// locCode=genericUtility.getColumnValue("loc_code", dom); // locCode=genericUtility.getColumnValue("loc_code", dom);
lotNo=genericUtility.getColumnValue("lot_no", dom); lotNo=genericUtility.getColumnValue("lot_no", dom);
siteCode=genericUtility.getColumnValue("site_code", dom1);
System.out.println("@V@ Site code at Item change :- ["+siteCode+"]");
sql="select QUANTITY,LOC_CODE from stock where item_code=? and lot_no=? and lot_sl=?"; // sql="select QUANTITY,LOC_CODE from stock where item_code=? and lot_no=? and lot_sl=?";
sql="select (case when quantity is null then 0.00 else quantity end - "
+ "case when alloc_qty is null then 0.00 else alloc_qty end - "
+ "case when hold_qty is null then 0.00 else hold_qty end)as QUANTITY,LOC_CODE "
+ "from stock where item_code=? and lot_no=? and lot_sl=? and site_code=?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, checkNull(itemCode));
// pstmt.setString(2, locCode); // pstmt.setString(2, locCode);
pstmt.setString(2, lotNo); pstmt.setString(2, checkNull(lotNo));
pstmt.setString(3, lotSl); pstmt.setString(3, checkNull(lotSl));
pstmt.setString(4, checkNull(siteCode));
rst=pstmt.executeQuery(); rst=pstmt.executeQuery();
if(rst.next()) if(rst.next())
{ {
......
webitm-mfg/ibase/webitm/ejb/mfg/ConsumptionOdrIssuWizPos.java
View file @ 0dacdd34
...@@ -44,7 +44,9 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -44,7 +44,9 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
@Override @Override
public String postSave(String domString, String editFlag, String xtraParams, Connection conn) throws RemoteException, ITMException public String postSave(String domString, String editFlag, String xtraParams, Connection conn) throws RemoteException, ITMException
{ {
String retString = ""; String retString = "",sql="";
int cnt=0;
// TODO Auto-generated method stub // TODO Auto-generated method stub
System.out.println("@V@ IN POST SAVE @@@"); System.out.println("@V@ IN POST SAVE @@@");
...@@ -126,10 +128,13 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -126,10 +128,13 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
/** /**
* Create Consumption Issue * Create Consumption Issue
* for respective consumption order * for respective consumption order
* */ * */
xmlString=createConsumeOrderIssue(tranIDOrder, xtraParams, headerDom, conn,userId, loginSite, empCode, termId); xmlString=createConsumeOrderIssue(tranIDOrder, xtraParams, headerDom, conn,userId, loginSite, empCode, termId);
System.out.println("@V@ Issue Generate retString :- ["+xmlString+"]"); System.out.println("@V@ Issue Generate retString :- ["+xmlString+"]");
retString = saveData(loginSite,xmlString,xtraParams,conn);
retString = saveData(loginSite,xmlString,xtraParams,conn);
System.out.println("@V@ Ret String after Issue create :- ["+retString+"]"); System.out.println("@V@ Ret String after Issue create :- ["+retString+"]");
if (retString.indexOf("Success") > -1) if (retString.indexOf("Success") > -1)
{ {
...@@ -146,6 +151,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -146,6 +151,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
retString=confirmTransaction(tranIDIssue, "consume_issue", xtraParams, "", conn); retString=confirmTransaction(tranIDIssue, "consume_issue", xtraParams, "", conn);
System.out.println("@V@ Ret string after issue confirm :- ["+retString+"]"); System.out.println("@V@ Ret string after issue confirm :- ["+retString+"]");
}else{ }else{
System.out.println("While Save Issue Found exception ..........");
throw new Exception(retString); throw new Exception(retString);
} }
}else{ }else{
...@@ -159,6 +165,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -159,6 +165,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
{ {
try try
{ {
System.out.println("Connection roleback..........");
conn.rollback(); conn.rollback();
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
...@@ -293,7 +300,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -293,7 +300,7 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
itemSer = genericUtility.getColumnValueFromNode("item_ser", parentNode); itemSer = genericUtility.getColumnValueFromNode("item_ser", parentNode);
locCode = genericUtility.getColumnValueFromNode("loc_code", parentNode); locCode = genericUtility.getColumnValueFromNode("loc_code", parentNode);
lotNo = genericUtility.getColumnValueFromNode("lot_no", parentNode); lotNo = genericUtility.getColumnValueFromNode("lot_no", parentNode);
lotSl = genericUtility.getColumnValueFromNode("lot_no", parentNode); lotSl = genericUtility.getColumnValueFromNode("lot_sl", parentNode);
acctCode = genericUtility.getColumnValueFromNode("acct_code", parentNode); acctCode = genericUtility.getColumnValueFromNode("acct_code", parentNode);
cctrCode = genericUtility.getColumnValueFromNode("cctr_code", parentNode); cctrCode = genericUtility.getColumnValueFromNode("cctr_code", parentNode);
quantity = genericUtility.getColumnValueFromNode("quantity", parentNode); quantity = genericUtility.getColumnValueFromNode("quantity", parentNode);
...@@ -302,6 +309,9 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -302,6 +309,9 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
String rate=getRate(siteCodeReq,itemCode,locCode,lotNo,lotSl,conn); String rate=getRate(siteCodeReq,itemCode,locCode,lotNo,lotSl,conn);
lineNo=selectedRow+1; lineNo=selectedRow+1;
System.out.println("Lot No :- ["+lotNo+"]");
System.out.println("Lot Sl :- ["+lotSl+"]");
//Generate Detail XML //Generate Detail XML
xmlBuff.append("<Detail2 dbID=\"\" domID=\"1\" objContext=\"2\" objName=\"consume_order\">"); xmlBuff.append("<Detail2 dbID=\"\" domID=\"1\" objContext=\"2\" objName=\"consume_order\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>"); xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
...@@ -619,12 +629,15 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio ...@@ -619,12 +629,15 @@ public class ConsumptionOdrIssuWizPos extends ValidatorEJB implements Consumptio
itemSer = genericUtility.getColumnValueFromNode("item_ser", parentNode); itemSer = genericUtility.getColumnValueFromNode("item_ser", parentNode);
locCode = genericUtility.getColumnValueFromNode("loc_code", parentNode); locCode = genericUtility.getColumnValueFromNode("loc_code", parentNode);
lotNo = genericUtility.getColumnValueFromNode("lot_no", parentNode); lotNo = genericUtility.getColumnValueFromNode("lot_no", parentNode);
lotSl = genericUtility.getColumnValueFromNode("lot_no", parentNode); lotSl = genericUtility.getColumnValueFromNode("lot_sl", parentNode);
acctCode = genericUtility.getColumnValueFromNode("acct_code", parentNode); acctCode = genericUtility.getColumnValueFromNode("acct_code", parentNode);
cctrCode = genericUtility.getColumnValueFromNode("cctr_code", parentNode); cctrCode = genericUtility.getColumnValueFromNode("cctr_code", parentNode);
quantity = genericUtility.getColumnValueFromNode("quantity", parentNode); quantity = genericUtility.getColumnValueFromNode("quantity", parentNode);
reqQty = genericUtility.getColumnValueFromNode("req_qty", parentNode); reqQty = genericUtility.getColumnValueFromNode("req_qty", parentNode);
System.out.println("Lot No Issue:- ["+lotNo+"]");
System.out.println("Lot Sl Issue:- ["+lotSl+"]");
qcReqd = commonFunctions.getValueFromRefTable("item", "item_code", itemCode + "", "qc_reqd", conn); qcReqd = commonFunctions.getValueFromRefTable("item", "item_code", itemCode + "", "qc_reqd", conn);
sql="SELECT ACCT_CODE__INV, CCTR_CODE__INV, NVL(RATE, 0) AS RATE FROM STOCK WHERE SITE_CODE =? AND ITEM_CODE =? AND LOC_CODE =? AND LOT_NO = ? AND LOT_SL = ?"; sql="SELECT ACCT_CODE__INV, CCTR_CODE__INV, NVL(RATE, 0) AS RATE FROM STOCK WHERE SITE_CODE =? AND ITEM_CODE =? AND LOC_CODE =? AND LOT_NO = ? AND LOT_SL = ?";
......
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