Commit 956e1817 authored by manohar's avatar manohar

some unnecessary imports commented and manual site lot_no generation logic corrected


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93586 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9f582a9e
...@@ -33,10 +33,10 @@ import javax.ejb.Stateless; ...@@ -33,10 +33,10 @@ import javax.ejb.Stateless;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
import org.apache.axis.client.Service; import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType; import org.apache.axis.encoding.XMLType;
import org.drools.runtime.pipeline.SmooksTransformerProvider; //import org.drools.runtime.pipeline.SmooksTransformerProvider;
import org.w3c.dom.*; import org.w3c.dom.*;
import com.borland.enterprise.xml.toolkit.impl.tomcat.v4_0.std.Type; //import com.borland.enterprise.xml.toolkit.impl.tomcat.v4_0.std.Type;
import javax.xml.rpc.ParameterMode; import javax.xml.rpc.ParameterMode;
import javax.xml.transform.*; import javax.xml.transform.*;
...@@ -3711,68 +3711,85 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3711,68 +3711,85 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
lotNoManualSite = distCommon.getDisparams("999999" , "LOT_NO_MANUAL_SITE", conn); //Gulzar - 25/11/11 lotNoManualSite = distCommon.getDisparams("999999" , "LOT_NO_MANUAL_SITE", conn); //Gulzar - 25/11/11
siteString = lotNoManualSite; siteString = lotNoManualSite;
while ( siteString.trim().length() > 0 ) // 10/09/13 manoharan in case there is no comma
String siteArray[];
siteArray = lotNoManualSite.split(",");
String siteTemp = "";
boolean manualLot = false;
for(int ctr = 0;ctr < siteArray.length;ctr++)
{ {
sitecode = distCommon.getToken( siteString , ","); siteTemp = siteArray[ctr];
if ( sitecode.trim() == siteCode.trim() ) if ( siteTemp.trim() == siteCode.trim() )
{ {
break; manualLot = true;
} }
} }
sql = "SELECT DISTINCT A.ITEM_CODE, (CASE WHEN A.BATCH_NO IS NULL THEN ' ' ELSE A.BATCH_NO END) AS BATCH_NO, A.LOC_CODE FROM PORCPDET A, ITEM B WHERE A.ITEM_CODE = B.ITEM_CODE AND TRAN_ID = ? AND (CASE WHEN B.STK_OPT IS NULL THEN '0' ELSE B.STK_OPT END) = '2' AND (A.LOT_NO IS NULL OR TRIM(A.LOT_NO) IS NULL OR LENGTH(TRIM(A.LOT_NO)) = 0 ) ";
pstmtSql = conn.prepareStatement(sql); /* while ( siteString.trim().length() > 0 )
pstmtSql.setString(1, tranId);
rs = pstmtSql.executeQuery();
while ( rs.next() )
{ {
itemCode = checkNull(rs.getString("ITEM_CODE")); sitecode = distCommon.getToken( siteString , ",");
batchNo = checkNull(rs.getString("BATCH_NO")); if ( sitecode.trim() == siteCode.trim() )
locCode = checkNull(rs.getString("LOC_CODE"));
//tranDate = getCurrdateAppFormat();
xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<qorder_no></qorder_no>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<qorder_date>" + getCurrdateAppFormat() + "</qorder_date>";
xmlValues = xmlValues + "<qorder_type>I</qorder_type>";
xmlValues = xmlValues + "<item_ser>" + itemSer + "</item_ser>";
xmlValues = xmlValues + "<porcp_no>" + tranId + "</porcp_no>";
xmlValues = xmlValues + "<porcp_line_no>" + lineNo + "</porcp_line_no>";
xmlValues = xmlValues +"</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
System.out.println("qcNo4="+qcNo);
if ( "ERROR".equals(qcNo) )
{ {
retString = itmDBAccessLocal.getErrorString("","VTTRANID","");
break; break;
} }
} */
if (!manualLot)
{
sql = "SELECT DISTINCT A.ITEM_CODE, (CASE WHEN A.BATCH_NO IS NULL THEN ' ' ELSE A.BATCH_NO END) AS BATCH_NO, A.LOC_CODE FROM PORCPDET A, ITEM B WHERE A.ITEM_CODE = B.ITEM_CODE AND TRAN_ID = ? AND (CASE WHEN B.STK_OPT IS NULL THEN '0' ELSE B.STK_OPT END) = '2' AND (A.LOT_NO IS NULL OR TRIM(A.LOT_NO) IS NULL OR LENGTH(TRIM(A.LOT_NO)) = 0 ) ";
pstmtSql = conn.prepareStatement(sql);
pstmtSql.setString(1, tranId);
rs = pstmtSql.executeQuery();
sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE = ? AND (LOT_NO IS NULL OR LENGTH(TRIM(LOT_NO)) = 0)" ; while ( rs.next() )
pstmtUpd = conn.prepareStatement(sql);
pstmtUpd.setString(1, qcNo);
pstmtUpd.setString(2, tranId);
pstmtUpd.setString(3, itemCode);
pstmtUpd.setString(4, batchNo);
pstmtUpd.setString(5, locCode);
updCnt = pstmtUpd.executeUpdate();
if ( pstmtUpd != null)
{ {
pstmtUpd.close(); itemCode = checkNull(rs.getString("ITEM_CODE"));
pstmtUpd = null; batchNo = checkNull(rs.getString("BATCH_NO"));
locCode = checkNull(rs.getString("LOC_CODE"));
//tranDate = getCurrdateAppFormat();
xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<qorder_no></qorder_no>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<qorder_date>" + getCurrdateAppFormat() + "</qorder_date>";
xmlValues = xmlValues + "<qorder_type>I</qorder_type>";
xmlValues = xmlValues + "<item_ser>" + itemSer + "</item_ser>";
xmlValues = xmlValues + "<porcp_no>" + tranId + "</porcp_no>";
xmlValues = xmlValues + "<porcp_line_no>" + lineNo + "</porcp_line_no>";
xmlValues = xmlValues +"</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
System.out.println("qcNo4="+qcNo);
if ( "ERROR".equals(qcNo) )
{
retString = itmDBAccessLocal.getErrorString("","VTTRANID","");
break;
}
sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE = ? AND (LOT_NO IS NULL OR LENGTH(TRIM(LOT_NO)) = 0)" ;
pstmtUpd = conn.prepareStatement(sql);
pstmtUpd.setString(1, qcNo);
pstmtUpd.setString(2, tranId);
pstmtUpd.setString(3, itemCode);
pstmtUpd.setString(4, batchNo);
pstmtUpd.setString(5, locCode);
updCnt = pstmtUpd.executeUpdate();
if ( pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd = null;
}
} }
pstmtSql.close();
pstmtSql = null;
rs.close();
rs = null;
} }
pstmtSql.close();
pstmtSql = null;
rs.close();
rs = null;
} }
} }
} }
...@@ -3865,7 +3882,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3865,7 +3882,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
NodeList detlList=null; NodeList detlList=null;
Document dom = null; Document dom = null;
HashMap hashMap=new HashMap<>(); HashMap hashMap=new HashMap();
boolean forceFlag=true; boolean forceFlag=true;
double quantity = 0.0, qtyDet = 0.0, updQty = 0.0, amountHdr = 0.0, conQtyStd = 0.0; double quantity = 0.0, qtyDet = 0.0, updQty = 0.0, amountHdr = 0.0, conQtyStd = 0.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