|
@@ -438,10 +438,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
}
|
|
|
|
|
|
// 人工上下料没有程序的情况直接用工序时间
|
|
|
- if (null != bomProcedureProgram && null != bomProcedureProgram.getRunTime()) {
|
|
|
+ if (null != bomProcedureProgram && null != bomProcedureProgram.getWorkTime()) {
|
|
|
candidateProcess.setProcedureId(bomProcedureProgram.getProcedureId());
|
|
|
- candidateProcess.setDuration(bomProcedureProgram.getRunTime().intValue());
|
|
|
- candidateProcess.setRunTime(bomProcedureProgram.getRunTime());
|
|
|
+ candidateProcess.setDuration(bomProcedureProgram.getWorkTime().intValue());
|
|
|
+ candidateProcess.setRunTime(bomProcedureProgram.getWorkTime());
|
|
|
} else {
|
|
|
candidateProcess.setProcedureId(bomProcedure.getId());
|
|
|
//candidateProcess.setDuration(bomProcedure.getPrepareWorkhours().intValue() + bomProcedure.getRatedWorkhours().intValue());
|