Commit dd52b2d5 authored by smanohar's avatar smanohar

Before deleting old machine load and tool plan and reallocating check for existing old plan

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216867 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a5f99958
...@@ -299,7 +299,11 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -299,7 +299,11 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
HashMap machineLoadMap=new HashMap(); HashMap machineLoadMap=new HashMap();
HashMap mcLoadMap=new HashMap(); HashMap mcLoadMap=new HashMap();
HashMap mcLoadDetMap=new HashMap(); HashMap mcLoadDetMap=new HashMap();
boolean updMachineLoad = false; // 19-Feb-2020 manoharan whether machine load exists
try{ try{
sql="select amd_date,work_order,operation,work_ctr,mc_code,mc_code__o,operation_parent" sql="select amd_date,work_order,operation,work_ctr,mc_code,mc_code__o,operation_parent"
+ " from worder_route_alt where amd_no = ?"; + " from worder_route_alt where amd_no = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -338,7 +342,17 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -338,7 +342,17 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
rs=null; rs=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
/////////////////////////////////////////////////////////////////////////////////////////////////////////
sql = "SELECT count(1) FROM work_calendar, workshft "
+ " WHERE ( work_calendar.site_code = workshft.site_code ) "
+ " and ( work_calendar.day_no = workshft.day_no ) "
+ " and ( work_calendar.shift = workshft.shift ) "
+ " and ( ( work_calendar.working = 'Y' ) "
+ " aND ( work_calendar.confirmed = 'Y' ) "
+ " AND ( work_calendar.site_code = ? ) "
+ " AND ( work_calendar.work_date >= ? ) ) ";
/////////////////////////////////////////////////////////////////////////////////////////////////////////
condParam.add("operation"); condParam.add("operation");
condParam.add("work_order"); condParam.add("work_order");
condParam.add(Integer.toString(operation)); condParam.add(Integer.toString(operation));
...@@ -477,6 +491,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -477,6 +491,7 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
pstmt.setInt(4, operation); pstmt.setInt(4, operation);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
while(rs.next()){ while(rs.next()){
updMachineLoad = true; // 19-Feb-2020 manoharan whether machine load exists
detSiteCode=checkNull(rs.getString(1)); detSiteCode=checkNull(rs.getString(1));
detLoadDate=rs.getTimestamp(2); detLoadDate=rs.getTimestamp(2);
detWorkCtr=checkNull(rs.getString(3)); detWorkCtr=checkNull(rs.getString(3));
...@@ -503,27 +518,30 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -503,27 +518,30 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
rs=null; rs=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
sql="Delete From machine_load_det Where work_ctr = ? and mc_code = ? " if (updMachineLoad) // 19-Feb-2020 manoharan whether machine load exists
+ "and work_order = ? and operation = ?"; {
pstmt=conn.prepareStatement(sql); sql="Delete From machine_load_det Where work_ctr = ? and mc_code = ? "
pstmt.setString(1, workctr); + "and work_order = ? and operation = ?";
pstmt.setString(2, mcCodeOld); pstmt=conn.prepareStatement(sql);
pstmt.setString(3, workorder); pstmt.setString(1, workctr);
pstmt.setInt(4, operation); pstmt.setString(2, mcCodeOld);
cnt=0; pstmt.setString(3, workorder);
cnt=pstmt.executeUpdate(); pstmt.setInt(4, operation);
System.out.println("No. of rows are deleted machine_load_det---->>["+cnt+"]"); cnt=0;
pstmt.close(); cnt=pstmt.executeUpdate();
pstmt=null; System.out.println("No. of rows are deleted machine_load_det---->>["+cnt+"]");
pstmt.close();
sql="Delete From Toolplan Where work_ctr = ? and mc_code = ? and work_order = ?"; pstmt=null;
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, workctr); sql="Delete From Toolplan Where work_ctr = ? and mc_code = ? and work_order = ?";
pstmt.setString(2, mcCodeOld); pstmt=conn.prepareStatement(sql);
pstmt.setString(3, workorder); pstmt.setString(1, workctr);
cnt=0; pstmt.setString(2, mcCodeOld);
cnt=pstmt.executeUpdate(); pstmt.setString(3, workorder);
System.out.println("No. of rows are deleted machine_load_det---->>["+cnt+"]"); cnt=0;
cnt=pstmt.executeUpdate();
System.out.println("No. of rows are deleted machine_load_det---->>["+cnt+"]");
}
// now allocate the new machine // now allocate the new machine
...@@ -676,6 +694,9 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -676,6 +694,9 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
} }
} }
} //end startRow } //end startRow
if(rs!=null) if(rs!=null)
rs.beforeFirst(); rs.beforeFirst();
...@@ -696,65 +717,68 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde ...@@ -696,65 +717,68 @@ public class WorkOrderRouteAltConf extends ActionHandlerEJB implements WorkOrde
pstmt.setString(4, shift);*/ pstmt.setString(4, shift);*/
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
} }
// now we have the calEndar in order just allocate For the no. of shifts if (updMachineLoad) // 19-Feb-2020 manoharan whether machine load exists
for(int i=1; i<=noOfShiftsActual;i++){ {
// now we have the calEndar in order just allocate For the no. of shifts
if(rs.next()){ for(int i=1; i<=noOfShiftsActual;i++){
shift=checkNull(rs.getString(1));
dayNo=checkNull(rs.getString(2)); if(rs.next()){
loadDate=rs.getTimestamp(3); shift=checkNull(rs.getString(1));
inTime=checkNull(rs.getString(4)); dayNo=checkNull(rs.getString(2));
endTime=checkNull(rs.getString(5)); loadDate=rs.getTimestamp(3);
} inTime=checkNull(rs.getString(4));
machToolMap.put("mc_code", mcCode); endTime=checkNull(rs.getString(5));
machToolMap.put("item", item); }
machToolMap.put("proc_code", procCode); machToolMap.put("mc_code", mcCode);
machToolMap.put("schedule", loadDate); machToolMap.put("item", item);
machToolMap.put("workcentre", workctr); machToolMap.put("proc_code", procCode);
machToolMap.put("work_order", workorder); machToolMap.put("schedule", loadDate);
machToolMap.put("workcentre", workctr);
machineLoadMap.put("site_code",siteCode); machToolMap.put("work_order", workorder);
machineLoadMap.put("scheduled_date",loadDate);
machineLoadMap.put("mc_code", mcCode); machineLoadMap.put("site_code",siteCode);
machineLoadMap.put("workcentre", workctr); machineLoadMap.put("scheduled_date",loadDate);
machineLoadMap.put("day_no", dayNo); machineLoadMap.put("mc_code", mcCode);
machineLoadMap.put("shift", shift); machineLoadMap.put("workcentre", workctr);
machineLoadMap.put("day_no", dayNo);
machineLoadMap.put("capacity_inqty", workOrderQty / noOfShiftsActual); machineLoadMap.put("shift", shift);
machineLoadMap.put("loaded_inqty", workOrderQty / noOfShiftsActual);
machineLoadMap.put("capacity_inqty", workOrderQty / noOfShiftsActual);
machineLoadMap.put("shift_start_time",inTime); machineLoadMap.put("loaded_inqty", workOrderQty / noOfShiftsActual);
machineLoadMap.put("shift_end_time",endTime);
machineLoadMap.put("loaded_intime",0); machineLoadMap.put("shift_start_time",inTime);
machineLoadMap.put("shift_end_time",endTime);
machineLoadMap.put("work_order", workorder); machineLoadMap.put("loaded_intime",0);
machineLoadMap.put("route_code", routeCode);
machineLoadMap.put("operation", operation); machineLoadMap.put("work_order", workorder);
machineLoadMap.put("proc_code", procCode); machineLoadMap.put("route_code", routeCode);
machineLoadMap.put("operation", operation);
machineLoadMap.put("seq_no", seqNo); machineLoadMap.put("proc_code", procCode);
machineLoadMap.put("operation_level", operLevel);
machineLoadMap.put("seq_no", seqNo);
machineLoadMap.putAll(machToolMap); machineLoadMap.put("operation_level", operLevel);
machineLoadMap.putAll(machToolMap);
error=gbfToolAlloc(conn, machineLoadMap,1);
System.out.println("Return string from gbfToolAlloc----->>["+error+"]");
if(error > 0){ error=gbfToolAlloc(conn, machineLoadMap,1);
conn.rollback(); System.out.println("Return string from gbfToolAlloc----->>["+error+"]");
return ""; if(error > 0){
}else if(error == 2){ conn.rollback();
continue; return "";
} }else if(error == 2){
continue;
//error in finding record in 'machine_load'. }
if(gbfMachineLoadUpdate(conn,machineLoadMap,1) == -1){
return "VTMCLHDR"; //error in finding record in 'machine_load'.
}else if(gbfMachineLoadDetUpdate(conn,mcLoadMap,machineLoadMap,1) == -1){ if(gbfMachineLoadUpdate(conn,machineLoadMap,1) == -1){
return "VTMCDET"; return "VTMCLHDR";
} }else if(gbfMachineLoadDetUpdate(conn,mcLoadMap,machineLoadMap,1) == -1){
return "VTMCDET";
}//end for loop }
}//end for loop
}
rs.close(); rs.close();
rs=null; rs=null;
pstmt.close(); pstmt.close();
......
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