Skip to content

B
business-java
Commit bfef682a authored by dpawar's avatar dpawar
Browse files
Options

added code for dept code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95728 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9970117c
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 18 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WorkOrderRouteAlt.java
View file @ bfef682a
......@@ -420,14 +420,46 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
System.out.println("confirmedOpr--->>["+confirmedOpr+"]");
if("N".equalsIgnoreCase(confirmedOpr)){
errCode = "VTOPRFDB";
//errString = getErrorString("site_code",errCode,userId);
errCode = "VTOPRFDB";
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
}
}
else if (childNodeName.equalsIgnoreCase("dept_code")){
String deptCode="";
deptCode = checkNull(genericUtility.getColumnValue("dept_code",dom));
System.out.println("deptCode--->>["+deptCode+"]");
if(deptCode.length() == 0){
errCode = "VTDEPTCNN"; //dept code not empty.
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}else{
sql="select count(*) from department where dept_code = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, deptCode);
rs=pstmt.executeQuery();
if(rs.next()){
cnt=rs.getInt(1);
}
if(rs!=null){
rs.close();
rs=null;
}
if(pstmt!=null){
pstmt.close();
pstmt=null;
}
System.out.println("deptCode cnt--->["+cnt+"]");
if(cnt == 0){
errCode = "VMDEP1"; //code does not exist in department master.
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
}
}
// Added by mahesh on 14-07-2014
else if (childNodeName.equalsIgnoreCase("site_code")){
String siteCode = "";
......@@ -439,7 +471,7 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
pstmt.setString(1, siteCode);
rs=pstmt.executeQuery();
if(rs.next()){
count=rs.getInt(1);
count=rs.getInt(1);
}
rs.close();
rs=null;
......@@ -703,9 +735,7 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
pstmt.close();
pstmt=null;
valueXmlString.append("<seq_no>").append("<![CDATA[" +seqno+ "]]>").append("</seq_no>");
valueXmlString.append("<seq_no>").append("<![CDATA[" +seqno+ "]]>").append("</seq_no>");
valueXmlString.append("<wait_time>").append("<![CDATA[" +wtime+ "]]>").append("</wait_time>");
valueXmlString.append("<set_time>").append("<![CDATA[" +stime+ "]]>").append("</set_time>");
valueXmlString.append("<reset_time>").append("<![CDATA[" +retime+ "]]>").append("</reset_time>");
......@@ -739,6 +769,24 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
routecodeDF=getColumnDescr(conn,"route_code","workorder","work_order",workOrderL);
valueXmlString.append("<route_code>").append("<![CDATA[" + routecodeDF + "]]>").append("</route_code>");
valueXmlString.append("<seq_no>").append("<![CDATA[]]>").append("</seq_no>");
valueXmlString.append("<wait_time>").append("<![CDATA[]]>").append("</wait_time>");
valueXmlString.append("<set_time>").append("<![CDATA[]]>").append("</set_time>");
valueXmlString.append("<reset_time>").append("<![CDATA[]]>").append("</reset_time>");
valueXmlString.append("<run_time>").append("<![CDATA[]]>").append("</run_time>");
valueXmlString.append("<item_code>").append("<![CDATA[]]>").append("</item_code>");
valueXmlString.append("<item_descr>").append("<![CDATA[]]>").append("</item_descr>");
valueXmlString.append("<work_ctr__o>").append("<![CDATA[]]>").append("</work_ctr__o>");
valueXmlString.append("<work_ctr>").append("<![CDATA[]]>").append("</work_ctr>");
valueXmlString.append("<mc_code__o>").append("<![CDATA[]]>").append("</mc_code__o>");
valueXmlString.append("<mc_code>").append("<![CDATA[]]>").append("</mc_code>");
valueXmlString.append("<machines_descr>").append("<![CDATA[]]>").append("</machines_descr>");
valueXmlString.append("<proc_code protect = \"0\">").append("<![CDATA[]]>").append("</proc_code>");
valueXmlString.append("<process_descr>").append("<![CDATA[]]>").append("</process_descr>");
}
else if (currentColumn.trim().equalsIgnoreCase("mc_code"))
{
......@@ -946,11 +994,7 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
StringBuffer sql1=new StringBuffer();
try{
if(condParamL.size() > 0){
System.out.println("---------arrayList Size---->>["+condParamL+"]");
System.out.println("---------arrayList values 1---->>["+condParamL.get(0)+"]");//"operation"
System.out.println("---------arrayList values 2---->>["+condParamL.get(1)+"]");//"work_order"
System.out.println("---------arrayList values 3---->>["+condParamL.get(2)+"]");//operation
System.out.println("---------arrayList values 4---->>["+condParamL.get(3)+"]");//work_order
System.out.println("condParamL--->>["+condParamL+"]");
sql1.append("select count(*) from "+tableName+" where "+condParamL.get(0)+" = ? and "+condParamL.get(1)+" = ? ");
if(condParamL.size() > 4)
{
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WorkOrderRouteAltConf.java
View file @ bfef682a
......@@ -174,7 +174,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
private String gbfRetrieveWoRouteAlt(String amdNo,String xtraParams,Connection conn)
{
String sql="",errcode = "", conf="", mcCode="" , worder="",dbName="",itemCode="",procCode="";
String loginEmpCode="",loginSite="",workCtr="",workCtrOld="",mcCodeOld="";
String loginEmpCode="",loginSite="",workCtr="",workCtrOld="",mcCodeOld="",deptCode="";
int operation=0,cnt=0;
double waitT=0,setT=0,resetT=0,runT=0;
ArrayList <String> updateParamList =new ArrayList();
......@@ -195,7 +195,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
if(errcode.length() == 0){
sql="select work_order,operation,item_code,proc_code,wait_time,set_time,run_time,reset_time,work_ctr,"
+ "mc_code,work_ctr__o,mc_code__o from worder_route_alt where amd_no= ?";
+ "mc_code,work_ctr__o,mc_code__o,dept_code from worder_route_alt where amd_no= ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, amdNo);
rs=pstmt.executeQuery();
......@@ -212,6 +212,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
mcCode=checkNull(rs.getString(10));
workCtrOld=checkNull(rs.getString(11));
mcCodeOld=checkNull(rs.getString(12));
deptCode=checkNull(rs.getString(13));
}
if(rs!=null){
rs.close();
......@@ -225,13 +226,13 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
System.out.println("operation---->"+operation);
System.out.println("mccode---->"+mcCode);
System.out.println("workCtr---->"+workCtr);
System.out.println("deptCode---->"+deptCode);
if(workCtr.length() == 0){
workCtr=workCtrOld;
}
if(mcCode.length() == 0){
mcCode=mcCodeOld;
}
}
updateParamMap.put("mcCode", mcCode);
updateParamMap.put("worder", worder);
......@@ -247,6 +248,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
updateParamMap.put("setT", Double.toString(setT));
updateParamMap.put("runT", Double.toString(runT));
updateParamMap.put("resetT", Double.toString(resetT));
updateParamMap.put("deptCode", deptCode);
// update worder_route and worder_route_alt table
......@@ -1150,7 +1152,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
try{
//sql="update worder_route set mc_code = ? where work_order = ? and operation = ?";
sql="update worder_route set mc_code = ?,item_code = ?,proc_code = ?,wait_time = ?,set_time = ?,"
+ "run_time = ?,reset_time = ?,work_ctr =? where work_order = ? and operation = ?";
+ "run_time = ?,reset_time = ?,work_ctr = ?,dept_code = ? where work_order = ? and operation = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, updateParamMapL.get("mcCode"));
pstmt.setString(2, updateParamMapL.get("itemCode"));
......@@ -1161,8 +1163,10 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
pstmt.setDouble(7, Double.parseDouble(updateParamMapL.get("resetT")));
pstmt.setString(8, updateParamMapL.get("workCtr"));
pstmt.setString(9, updateParamMapL.get("worder"));
pstmt.setInt(10, Integer.parseInt(updateParamMapL.get("operation")));
pstmt.setString(9, updateParamMapL.get("deptCode"));
pstmt.setString(10, updateParamMapL.get("worder"));
pstmt.setInt(11, Integer.parseInt(updateParamMapL.get("operation")));
count=pstmt.executeUpdate();
......
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