Skip to content

B
business-java
Commit a786d6fa authored by cpatil's avatar cpatil
Browse files
Options

modify code for wo stock transfer for same side code, remove form 2 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98584 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8b5bb60f
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 50 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WoTransferPrc.java
View file @ a786d6fa
......@@ -1174,9 +1174,25 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
MfgCommon mfgComm = new MfgCommon();
double qtyPerArtFr=0;
double noArt=0;
String invstat1Str="";
try
{
invstat1 = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", connOne);
System.out.println("@@@@@@ invstat1["+invstat1+"]");
String invstat1Arr[]=invstat1.split(",");
for(int arrLnegth=0;arrLnegth<invstat1Arr.length;arrLnegth++)
{
invstat1Str = invstat1Str + "'" + invstat1Arr[arrLnegth] + "',";
}
if( invstat1Str != null && invstat1Str.trim().length() > 0 )
{
invstat1Str = invstat1Str.substring(0, invstat1Str.length()-1);
}
System.out.println("@@@@@ invstat1Str["+invstat1Str+"]");
System.out.println("@@@@@@@ wostock trans. function called::");
xmlBuff = new StringBuffer();
genericUtility = GenericUtility.getInstance();
......@@ -1426,7 +1442,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
sql = "select tran_id,line_no,item_code,lot_no,lot_sl,loc_code, quantity,exp_lev "+
" from inv_alloc_det where tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE "+
" WHERE WORK_ORDER IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "+
" and loc_code in(select loc_code from location where inv_stat in("+invstat1+") ) and site_code = ? and item_code= ? "
" and loc_code in(select loc_code from location where inv_stat in("+invstat1Str+") ) and site_code = ? and item_code= ? " // change invstat1 to invstat1Str for multiple loc code on 22/09/15 by cpatil
+ "and case when deallocated is null then 'N' else deallocated end = 'N' and lot_no=? and lot_sl=? and loc_code=? ";
pstmt = connOne.prepareStatement(sql);
......
webitm-mfg/ibase/webitm/ejb/mfg/WoTrfWizIC.java
View file @ a786d6fa
......@@ -95,7 +95,8 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
int locCnt=0;
String subStoreInvStat="";
String mainStoreInvStat="";
String siteCode="",subStoreInvStatStr="";
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -136,8 +137,8 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
System.out.println("@@@@@@ workOrder["+workOrder+"] campaign_no null....");
if( workOrder == null || workOrder.trim().length() == 0 )
{
errString = getErrorString("campaign_no","VTCAMPNO2",userId);
break;
errString = getErrorString("campaign_no","VTCAMPNO2",userId);
break;
}
}
else
......@@ -161,16 +162,16 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
errString = getErrorString("campaign_no","VTCAMPNO1",userId);
break;
}
workOrder = checkNull(genericUtility.getColumnValue("work_order_iss", dom));
if( workOrder != null && workOrder.trim().length() > 0 )
{
errString = getErrorString("campaign_no","VTCAMPNO3",userId);
break;
errString = getErrorString("campaign_no","VTCAMPNO3",userId);
break;
}
}
}
if( childNodeName.equalsIgnoreCase( "work_order_iss" ))
{
System.out.println("work_order_iss ");
......@@ -187,8 +188,8 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
else
{
workOrder = genericUtility.getColumnValue("work_order_iss", dom);
sql = "SELECT COUNT(*) FROM workorder_iss WHERE tran_id = ?";
sql = "SELECT COUNT(*) FROM workorder_iss WHERE tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, workOrder);
rs = pstmt.executeQuery();
......@@ -206,12 +207,39 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
errString = getErrorString("workorder_iss","VTWORDNO1",userId);
break;
}
else
{
siteCode = genericUtility.getColumnValue("site_code", dom);
sql = "SELECT COUNT(*) FROM workorder_iss WHERE tran_id = ? and site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, workOrder);
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(count == 0)
{
errString = getErrorString("workorder_iss","VTWORDNO3",userId);
break;
}
}
}
}
}
}
break;
/*
case 2 :
{
System.out.println("case2 wfvalData()::");
......@@ -310,15 +338,17 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
}
}
break;
case 3:
*/
case 2: // change case 2 from case 3 for remove second screen
{
parentNodeList = dom.getElementsByTagName("Detail3");
parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for(ctr = 0; ctr < childNodeListLength; ctr++)
{
System.out.println("Enter into detail3 validation");
System.out.println("Enter into detail2 validation");
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
System.out.println("childNodeName ::"+childNodeName);
......@@ -356,26 +386,35 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
errString = getErrorString("loc_code__to","VTLOCTO2",userId);
break;
}
subStoreInvStat = mfgComm.getEnvMfg("999999","SUB_ST_INVSTAT", conn);
System.out.println("@@@@@ subStoreInvStat["+subStoreInvStat+"]");
String subStoreArr[]=subStoreInvStat.split(",");
Set <String>subStorSet=new HashSet<String>();
for(int arrLnegth=0;arrLnegth<subStoreArr.length;arrLnegth++)
{
subStorSet.add(subStoreArr[arrLnegth]);
subStoreInvStatStr = subStoreInvStatStr + "'" + subStoreArr[arrLnegth] + "',";
}
mainStoreInvStat = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", conn);
if( subStoreInvStatStr != null && subStoreInvStatStr.trim().length() > 0 )
{
subStoreInvStatStr = subStoreInvStatStr.substring(0, subStoreInvStatStr.length()-1);
}
System.out.println("@@@@@ subStoreInvStatStr["+subStoreInvStatStr+"]");
mainStoreInvStat = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", conn);
String mainStoreArr[]=mainStoreInvStat.split(",");
for(int arrLnegth=0;arrLnegth<mainStoreArr.length;arrLnegth++)
{
String mainStoreStat= mainStoreArr[arrLnegth];
System.out.println("@@@@@ mainStoreStat["+mainStoreStat+"]");
if(subStorSet.contains(mainStoreStat))
{
errString=getErrorString("loc_code__to","VTDISPVAR",userId);
break;
}
}
/*if(subStoreInvStat.equalsIgnoreCase(mainStoreInvStat))
{
......@@ -384,27 +423,27 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
break;
//return errString;
}*/
sql = "select count(1) from location where loc_code = ? and inv_stat in("+subStoreInvStat+")";
sql = "select count(1) from location where loc_code = ? and inv_stat in("+subStoreInvStatStr+")";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,locCodeTo);
//pstmt.setString(2,subStoreInvStat);
rs = pstmt.executeQuery();
if(rs.next())
{
locCnt = rs.getInt(1);
}
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
if(locCnt == 0)
{
//errString = itmDBAccessEJB.getErrorString("","VTLOCCDTO1 ","","",conn);
errString=getErrorString("loc_code__to","VTLOCCDTO1",userId);
rs = pstmt.executeQuery();
if(rs.next())
{
locCnt = rs.getInt(1);
}
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
if(locCnt == 0)
{
//errString = itmDBAccessEJB.getErrorString("","VTLOCCDTO1 ","","",conn);
errString=getErrorString("loc_code__to","VTLOCCDTO1",userId);
return errString;
}
}
}
}
......@@ -510,7 +549,7 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
java.util.Date utilDate = new java.util.Date();
String remarks="",reasCode="",explev="",campaignNo = "",workOrderIssuId="";
double issQty=0.0,integralQty=0.0,potencyadj=0.0;
String mainStoreInvStat="";
String mainStoreInvStat="", mainStoreInvStatStr="";
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -518,6 +557,20 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
connDriver=null;
MfgCommon mfgComm=new MfgCommon();
mainStoreInvStat = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", conn);
System.out.println("@@@@@@ mainStoreInvStat["+mainStoreInvStat+"]");
//mainStoreInvStat
String mainStoreArr[]=mainStoreInvStat.split(",");
for(int arrLnegth=0;arrLnegth<mainStoreArr.length;arrLnegth++)
{
mainStoreInvStatStr = mainStoreInvStatStr + "'" + mainStoreArr[arrLnegth] + "',";
}
if( mainStoreInvStatStr != null && mainStoreInvStatStr.trim().length() > 0 )
{
mainStoreInvStat = mainStoreInvStatStr.substring(0, mainStoreInvStatStr.length()-1);
}
System.out.println("@@@@@ mainStoreInvStat["+mainStoreInvStat+"]");
//mainStoreInvStat=mainStoreInvStat.replace(",","','");
String applDateFormat = genericUtility.getApplDateFormat();
......@@ -532,6 +585,81 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
switch(currentFormNo)
{
// added by cpatil on 22/09/15 fro set login site code default
case 1 :
{
siteCode=checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
System.out.println("siteCode---"+siteCode);
//siteCode =(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
currDateNew = java.sql.Timestamp.valueOf(sdf1.format(new java.util.Date()).toString() + " 00:00:00.0");
// currDate = new java.util.Date();
sdf = new SimpleDateFormat(applDateFormat);
currDateStr = sdf.format(currDateNew);
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ));
System.out.println("********* login code ["+loginCode+"]");
sql = "SELECT EMP_CODE FROM USERS WHERE CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
empCode = rs.getString("EMP_CODE");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
valueXmlString.append("<Detail1 domID='1' selected=\"N\">\r\n");
// valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
//chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ));
//siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
sql = "SELECT DESCR FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
siteDescr = rs.getString("DESCR");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
valueXmlString.append("<tran_date protect = '1'><![CDATA[" ).append( currDateStr ).append( "]]></tran_date>\r\n" );
// valueXmlString.append("<site_code protect = '1'>").append("<![CDATA["+"PL001"+"]]>").append("</site_code>");
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
valueXmlString.append("<site_descr><![CDATA[" ).append( checkNull( siteDescr )).append( "]]></site_descr>\r\n" );
//valueXmlString.append("<item_ser><![CDATA[" ).append( "NT" ).append( "]]></item_ser>\r\n" );
//valueXmlString.append("<ref_ser__for><![CDATA[" ).append( "XFRX" ).append( "]]></ref_ser__for>\r\n" );
// valueXmlString.append("<emp_codpstmt != nulle__aprv protect = '1'><![CDATA["+ empCode +"]]></emp_code__aprv>");
}
valueXmlString.append("</Detail1>");
}
break;
// end
/* // commented by cpatil on 22/09/15 for remove second screen
case 2 :
{
siteCode=checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
......@@ -600,7 +728,9 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
valueXmlString.append("</Detail2>");
}
break;
case 3 :
*/
case 2 :
{
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ));
loginSiteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
......@@ -638,10 +768,10 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
" , wi.work_order " +
" from workorder_iss wi, workorder_issdet wd " +
" where wi.tran_id = wd.tran_id " +
// " and wi.work_order = ? " +
// " and wi.work_order = ? " +
" and wi.tran_id = ? "
+ " and wd.loc_code in(select loc_code from location where inv_stat in("+mainStoreInvStat+")) " +
" group by wd.item_code, wd.lot_no, wd.lot_sl, wd.loc_code, wi.work_order ";
}
else if( campaignNo != null && campaignNo.trim().length() > 0 )
......@@ -747,7 +877,7 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
pstmt1.close();
pstmt1 = null;
valueXmlString.append("<Detail3 domID='" + lineNo+ "' selected=\"N\">\r\n");
valueXmlString.append("<Detail2 domID='" + lineNo+ "' selected=\"N\">\r\n");
// valueXmlString.append("<Detail3 domID='" + lineNo+ "' selected=\"Y\">\r\n");
......@@ -790,10 +920,10 @@ public class WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal, WoTrf
{
valueXmlString.append("<work_order><![CDATA[").append(rs.getString("work_order")).append("]]></work_order>\r\n"); // cpatil
}
valueXmlString.append("</Detail3>\r\n");
valueXmlString.append("</Detail2>\r\n");
}
if (pstmt != null)
{
......
webitm-mfg/ibase/webitm/ejb/mfg/WoTrfWizPos.java
View file @ a786d6fa
......@@ -122,7 +122,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
dom = genericUtility.parseString(domString);
siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
parentNodeList = dom.getElementsByTagName("Detail3");
parentNodeList = dom.getElementsByTagName("Detail2"); // changes detail3 to detail2 as second screen remove and field set in screen 1 by cpatil on 22/09/15
parentNodeListLength = parentNodeList.getLength();
// added on 25/MAR/14 BY RITESH START
loginCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
......@@ -149,12 +149,12 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
System.out.println("@@@@@@ empCode["+empCode+"]");
campaignNo= checkNull(genericUtility.getColumnValueFromNode("campaign_no",dom.getElementsByTagName("Detail1").item(ctr)));
worderIss= checkNull(genericUtility.getColumnValueFromNode("work_order_iss",dom.getElementsByTagName("Detail1").item(ctr)));
siteCodeDom= ((genericUtility.getColumnValueFromNode("site_code",dom.getElementsByTagName("Detail2").item(ctr))).trim());
itemSer= ((genericUtility.getColumnValueFromNode("item_ser",dom.getElementsByTagName("Detail2").item(ctr))).trim());
tranDate= ((genericUtility.getColumnValueFromNode("tran_date",dom.getElementsByTagName("Detail2").item(ctr))).trim());
refSerFor= ((genericUtility.getColumnValueFromNode("ref_ser__for",dom.getElementsByTagName("Detail2").item(ctr))).trim());
siteCodeDom= ((genericUtility.getColumnValueFromNode("site_code",dom.getElementsByTagName("Detail1").item(ctr))).trim()); // changes detail2 to detail1 as second screen remove and field set in screen 1 by cpatil on 22/09/15
//itemSer= ((genericUtility.getColumnValueFromNode("item_ser",dom.getElementsByTagName("Detail2").item(ctr))).trim()); // commented as second screen remove by cpatil on 22/09/15
tranDate= ((genericUtility.getColumnValueFromNode("tran_date",dom.getElementsByTagName("Detail1").item(ctr))).trim()); // changes detail2 to detail1 as second screen remove and field set in screen 1 by cpatil on 22/09/15
//refSerFor= ((genericUtility.getColumnValueFromNode("ref_ser__for",dom.getElementsByTagName("Detail2").item(ctr))).trim()); // commented as second screen remove by cpatil on 22/09/15
System.out.println("campaignNo["+campaignNo+"]worder["+worder+"]siteCodeDom["+siteCodeDom+"]itemSer["+itemSer+"]tranDate["+tranDate+"] refSerFor["+refSerFor+"] locCodeTo["+locCodeTo+"]");
System.out.println("campaignNo["+campaignNo+"]worderIss["+worderIss+"]worder["+worder+"]siteCodeDom["+siteCodeDom+"]itemSer["+itemSer+"]tranDate["+tranDate+"] refSerFor["+refSerFor+"] locCodeTo["+locCodeTo+"]");
//genratedTranId = generateTranId( "w_stock_transfer",siteCode, conn );
/*sql = "INSERT INTO STOCK_TRANSFER(SITE_CODE,ITEM_SER,REF_SER__FOR,TRAN_DATE,TRAN_ID,CONFIRMED) VALUES(?,?,?,?,?,?)";
pstmt = conn.prepareStatement( sql );
......@@ -225,7 +225,8 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
reasCode = genericUtility.getColumnValueFromNode("reas_code", parentNode);
explev = genericUtility.getColumnValueFromNode("exp_lev", parentNode);
remarks = genericUtility.getColumnValueFromNode("remarks", parentNode);
if(campaignNo!=null && "null".equalsIgnoreCase(campaignNo) && campaignNo.trim().length()>0)
if(worderIss!=null && (!"null".equalsIgnoreCase(worderIss)) && worderIss.trim().length()>0)
{
//Set work_order from workorder_iss qty by manoj dtd 18/09/2015
pstmt=conn.prepareStatement("select work_order from workorder_iss where tran_id=?");
......@@ -314,9 +315,9 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
}
if(insertFlag)
{
sql="UPDATE WORKORDER_ISSDET SET LOC_CODE=? WHERE "
sql=" UPDATE WORKORDER_ISSDET SET LOC_CODE=? WHERE "
+ "TRAN_ID IN(SELECT TRAN_ID FROM WORKORDER_ISS WHERE "
+ "WORK_ORDER IN(SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO=?"
+ " WORK_ORDER IN(SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO=? "
+ "UNION ALL SELECT '"+worder+"' FROM DUAL) "
+ ") AND ITEM_CODE=? AND LOT_NO=? AND LOT_SL=? AND LOC_CODE=? AND EXP_LEV=? ";
......
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