生产报工单

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-11-01 23:21:32 +08:00
parent 73a96ef841
commit a2b776ca07
2 changed files with 25 additions and 5 deletions

View File

@ -116,11 +116,13 @@ public class ProFeedbackController extends BaseController
public AjaxResult add(@RequestBody ProFeedback proFeedback) public AjaxResult add(@RequestBody ProFeedback proFeedback)
{ {
MdWorkstation workstation = mdWorkstationService.selectMdWorkstationByWorkstationId(proFeedback.getWorkstationId()); MdWorkstation workstation = mdWorkstationService.selectMdWorkstationByWorkstationId(proFeedback.getWorkstationId());
proFeedback.setProcessId(workstation.getProcessId()); if(StringUtils.isNotNull(workstation)){
proFeedback.setProcessCode(workstation.getProcessCode()); proFeedback.setProcessId(workstation.getProcessId());
proFeedback.setProcessName(workstation.getProcessName()); proFeedback.setProcessCode(workstation.getProcessCode());
proFeedback.setProcessName(workstation.getProcessName());
//根据生产工单工作站工序 查找对应的生产任务 }else {
return AjaxResult.error("当前生产任务对应的工作站不存在!");
}
return toAjax(proFeedbackService.insertProFeedback(proFeedback)); return toAjax(proFeedbackService.insertProFeedback(proFeedback));
} }
@ -161,7 +163,15 @@ public class ProFeedbackController extends BaseController
@PutMapping("/{recordId}") @PutMapping("/{recordId}")
public AjaxResult execute(@PathVariable("recordId") Long recordId){ public AjaxResult execute(@PathVariable("recordId") Long recordId){
if(!StringUtils.isNotNull(recordId)){
return AjaxResult.error("请先保存单据");
}
ProFeedback feedback= proFeedbackService.selectProFeedbackByRecordId(recordId); ProFeedback feedback= proFeedbackService.selectProFeedbackByRecordId(recordId);
if(feedback.getQuantityFeedback().compareTo(BigDecimal.ZERO) !=1){
return AjaxResult.error("报工数量必须大于0");
}
ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(feedback.getWorkorderId()); ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(feedback.getWorkorderId());
//更新生产任务的生产数量 //更新生产任务的生产数量
ProTask task = proTaskService.selectProTaskByTaskId(feedback.getTaskId()); ProTask task = proTaskService.selectProTaskByTaskId(feedback.getTaskId());
@ -196,6 +206,9 @@ public class ProFeedbackController extends BaseController
executeItemConsume(itemConsume); executeItemConsume(itemConsume);
} }
//更新报工单的状态
feedback.setStatus(UserConstants.ORDER_STATUS_FINISHED);
proFeedbackService.updateProFeedback(feedback);
return AjaxResult.success(); return AjaxResult.success();
} }

View File

@ -166,6 +166,9 @@ public class ProTaskController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ProTask proTask) public AjaxResult add(@RequestBody ProTask proTask)
{ {
if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
return AjaxResult.error("排产数量必须大于0");
}
//生产工单 //生产工单
ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId()); ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId());
@ -191,6 +194,7 @@ public class ProTaskController extends BaseController
proTask.setTaskName(new StringBuilder().append(proTask.getItemName()).append("").append(proTask.getQuantity().toString()).append("").append(proTask.getUnitOfMeasure()).toString()); proTask.setTaskName(new StringBuilder().append(proTask.getItemName()).append("").append(proTask.getQuantity().toString()).append("").append(proTask.getUnitOfMeasure()).toString());
return toAjax(proTaskService.insertProTask(proTask)); return toAjax(proTaskService.insertProTask(proTask));
} }
@ -202,6 +206,9 @@ public class ProTaskController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ProTask proTask) public AjaxResult edit(@RequestBody ProTask proTask)
{ {
if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
return AjaxResult.error("排产数量必须大于0");
}
return toAjax(proTaskService.updateProTask(proTask)); return toAjax(proTaskService.updateProTask(proTask));
} }