Commit c70f66ab authored by dahai's avatar dahai

修改更改废证任务单状态

parent c5f8dc88
...@@ -218,7 +218,6 @@ public class TaskListApi { ...@@ -218,7 +218,6 @@ public class TaskListApi {
* (分拣) * (分拣)
* *
* @param process 工序 * @param process 工序
* @param resp
* @return * @return
*/ */
@RequestMapping("queryByCountyAtAuxiliaryState4") @RequestMapping("queryByCountyAtAuxiliaryState4")
......
...@@ -58,6 +58,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -58,6 +58,7 @@ public class TaskListServiceImpl implements TaskListService {
switch (process) { switch (process) {
case "3": case "3":
taskListMapper.updateState3(taskId, process, name); taskListMapper.updateState3(taskId, process, name);
taskListMapper.updateState4(taskId, (Long.valueOf(process)+1)+"", name);
break; break;
case "4": case "4":
taskListMapper.updateState4(taskId, process, name); taskListMapper.updateState4(taskId, process, name);
...@@ -85,6 +86,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -85,6 +86,7 @@ public class TaskListServiceImpl implements TaskListService {
break; break;
case "3": case "3":
failedCardEntity.setState((long)2); failedCardEntity.setState((long)2);
failedCardEntity.setState((long)3);
break; break;
case "4": case "4":
failedCardEntity.setState((long)3); failedCardEntity.setState((long)3);
...@@ -106,7 +108,6 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -106,7 +108,6 @@ public class TaskListServiceImpl implements TaskListService {
public boolean updateState1(List<String> failedList,List<String> list, String process, String name,String workGroup) { public boolean updateState1(List<String> failedList,List<String> list, String process, String name,String workGroup) {
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState1(taskId, process, name,workGroup); taskListMapper.updateState1(taskId, process, name,workGroup);
} }
return true; return true;
} }
...@@ -120,13 +121,14 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -120,13 +121,14 @@ public class TaskListServiceImpl implements TaskListService {
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState2(taskId, process, name); taskListMapper.updateState2(taskId, process, name);
} }
for (String taskId : list) {
taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name);
}
}else { }else {
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState2(taskId, process, name); taskListMapper.updateState2(taskId, process, name);
} }
for (String taskId : list) {
taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name);
}
} }
for (String failedId :failedlist){ for (String failedId :failedlist){
......
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