Commit 59553f8f authored by manohar's avatar manohar

qty_sample from siteitem considered


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94217 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6322e1fb
...@@ -2869,7 +2869,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2869,7 +2869,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//ldt_qcduedate = datetime(relativedate(date(ldt_tran_date),lc_qcleadtime)) //ldt_qcduedate = datetime(relativedate(date(ldt_tran_date),lc_qcleadtime))
sql = "SELECT SITEITEM.ITEM_SER , SITEITEM.QC_REQD, SITEITEM. PROC_MTH,ITEM.QC_REQD_TYPE FROM SITEITEM , ITEM WHERE ITEM.ITEM_CODE = SITEITEM.ITEM_CODE AND SITEITEM.ITEM_CODE = ? AND SITEITEM.SITE_CODE = ? "; sql = "SELECT SITEITEM.ITEM_SER , SITEITEM.QC_REQD, SITEITEM. PROC_MTH,ITEM.QC_REQD_TYPE, (CASE WHEN QTY_SAMPLE IS NULL THEN 0 ELSE QTY_SAMPLE END) AS QTY_SAMPLE FROM SITEITEM , ITEM WHERE ITEM.ITEM_CODE = SITEITEM.ITEM_CODE AND SITEITEM.ITEM_CODE = ? AND SITEITEM.SITE_CODE = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, itemCode); pstmt1.setString(1, itemCode);
pstmt1.setString(2, siteCode); pstmt1.setString(2, siteCode);
...@@ -2880,6 +2880,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2880,6 +2880,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
qcReqdSite = checkNull(rs1.getString("QC_REQD")); qcReqdSite = checkNull(rs1.getString("QC_REQD"));
procMth = checkNull(rs1.getString("PROC_MTH")); procMth = checkNull(rs1.getString("PROC_MTH"));
qcType = checkNull(rs1.getString("QC_REQD_TYPE")); //added by Kunal Mandhre on 29/10/12 qcType = checkNull(rs1.getString("QC_REQD_TYPE")); //added by Kunal Mandhre on 29/10/12
qtySampleSiteItem = rs1.getDouble("QTY_SAMPLE");
} }
else else
{ {
...@@ -2902,7 +2903,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2902,7 +2903,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = null; rs1 = null;
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
if (qtySampleSiteItem > 0 )
{
qtySample = qtySampleSiteItem;
}
if(itemSer == null || itemSer.trim().length() == 0) if(itemSer == null || itemSer.trim().length() == 0)
{ {
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = ?"; sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = ?";
......
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