Commit ea9bce8e authored by manohar's avatar manohar

status except C and X allowed to amend


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92473 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cd447ac6
......@@ -137,9 +137,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
{
siteCode = getColumnValue("site_code",dom);
siteCode = siteCode == null ? "" : siteCode;
sql = "Select count(*) from site where site_code = ?";
sql = "Select count(*) from site where site_code ='"+siteCode+"'";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -159,7 +158,8 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
else if (childNodeName.equalsIgnoreCase("work_order__ref"))
{
tranIdRef = getColumnValue("work_order__ref",dom);
sql = "Select status from workorder where work_order = ?";
sql = "Select status from workorder where work_order = ?" ; //'"+tranIdRef+"'";
//System.out.println("Sql for status................:- " + sql);
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,tranIdRef);
rs = pstmt.executeQuery();
......@@ -172,16 +172,12 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
pstmt = null;
rs = null;
System.out.println("status>>>>>>>>>>>>>> " + status);
if( status.equalsIgnoreCase("R") || status.equalsIgnoreCase("U"))
{
System.out.println("U R permited>>>>>>>>>>>>>> " + status);
}
else
if( "X".equalsIgnoreCase(status) || "C".equalsIgnoreCase(status))
{
errCode = "VTWOSA";
errString = getErrorString("tran_id__ref",errCode,userId);
break;
}
}
}// End Of tran_id__ref
else if (childNodeName.equalsIgnoreCase("mfg_date__start"))
......@@ -200,11 +196,15 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
else
{
mfgDateStart = genericUtility.getValidDateString(mfgDateStart,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
System.out.println("mfgDateStart in dbdate format:- " + mfgDateStart);
System.out.println("mfgDateStart + 00:00:00.0 in dbdate format:- " + (mfgDateStart + " 00:00:00.0"));
mfgDateStartTs = Timestamp.valueOf(mfgDateStart + " 00:00:00.0");
System.out.println("mfgDateStart in Timestamp:- " + mfgDateStart);
if(mfgDateStartOld != null && mfgDateStartOld.trim().length() > 0)
{
mfgDateStartOld = genericUtility.getValidDateString(mfgDateStartOld,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
System.out.println("mfgDateStartOld in dbdate format:- " + mfgDateStartOld);
System.out.println("mfgDateStartOld + 00:00:00.0 in dbdate format:- " + (mfgDateStartOld + " 00:00:00.0"));
mfgDateStartOldTs = Timestamp.valueOf(mfgDateStartOld + " 00:00:00.0");
System.out.println("mfgDateStartOldTs in Timestamp:- " + mfgDateStartOldTs);
if(mfgDateStartTs.compareTo(mfgDateStartOldTs) == 0)
......@@ -220,13 +220,13 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
break;
}
}
/*if(mfgDateStartTs.before(getCurrdateAppFormat()))
if(mfgDateStartTs.before(getCurrdateAppFormat()))
{
System.out.println("Previous day mfg date:");
errCode = "VTWOMFMFT";
errString = getErrorString("start_time",errCode,userId);
break;
}*/
}
}
}//end mfg_date
else if (childNodeName.equalsIgnoreCase("exp_date"))
......@@ -333,13 +333,13 @@ public class WorkOrderAmd extends ValidatorEJB implements WorkOrderAmdLocal, W
break;
}
}
/*if(planDueDateTs.before(getCurrdateAppFormat()))
if(planDueDateTs.before(getCurrdateAppFormat()))
{
System.out.println("Previous day plan date:");
errCode = "VTWOMFPLT";
errString = getErrorString("start_time",errCode,userId);
break;
}*/
}
}//plan__due_date not null
}// end plan__due_date
// end proj_time
......
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