mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加校验

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2023-12-14 14:54:18 +08:00
parent 8cea692184
commit 4a96a7c222
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java
View File

@ -179,10 +179,16 @@ public class MdWorkstationController extends BaseController
return AjaxResult.error("工作站名称已存在！"); return AjaxResult.error("工作站名称已存在！");
} }
ProProcess process = proProcessService.selectProProcessByProcessId(mdWorkstation.getProcessId()); ProProcess process = proProcessService.selectProProcessByProcessId(mdWorkstation.getProcessId());
if(!StringUtils.isNotNull(process)){
return AjaxResult.error("工序不存在！");
}
mdWorkstation.setProcessCode(process.getProcessCode()); mdWorkstation.setProcessCode(process.getProcessCode());
mdWorkstation.setProcessName(process.getProcessName()); mdWorkstation.setProcessName(process.getProcessName());
MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId()); MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId());
if(!StringUtils.isNotNull(workshop)){
return AjaxResult.error("车间不存在！");
}
mdWorkstation.setWorkshopCode(workshop.getWorkshopCode()); mdWorkstation.setWorkshopCode(workshop.getWorkshopCode());
mdWorkstation.setWorkshopName(workshop.getWorkshopName()); mdWorkstation.setWorkshopName(workshop.getWorkshopName());

21
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
View File

@ -233,20 +233,37 @@ public class ProTaskController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ProTask proTask) public AjaxResult edit(@RequestBody ProTask proTask)
{ {
ProTask theTask = proTaskService.selectProTaskByTaskId(proTask.getTaskId());
if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){ if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
return AjaxResult.error("排产数量必须大于0！"); return AjaxResult.error("排产数量必须大于0！");
} }
if(!StringUtils.isNotNull(proTask.getWorkstationId())){ if(!StringUtils.isNotNull(proTask.getWorkstationId())){
return AjaxResult.error("请选择工作站！"); proTask.setWorkstationId(theTask.getWorkstationId());
}
if(!StringUtils.isNotNull(proTask.getWorkorderId())){
proTask.setWorkorderId(theTask.getWorkorderId());
}
if(!StringUtils.isNotNull(proTask.getProcessId())){
proTask.setProcessId(theTask.getProcessId());
}
if(!StringUtils.isNotNull(proTask.getRouteId())){
proTask.setRouteId(theTask.getRouteId());
} }
if(proTask.getDuration()<=0){ if(proTask.getDuration()<=0){
return AjaxResult.error("生产时长必须大于0！"); proTask.setDuration(theTask.getDuration());
} }
//生产工单 //生产工单
ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId()); ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId());
if(!StringUtils.isNotNull(order)){
return AjaxResult.error("生产工单不存在!");
}
proTask.setWorkorderCode(order.getWorkorderCode()); proTask.setWorkorderCode(order.getWorkorderCode());
proTask.setWorkorderName(order.getWorkorderName()); proTask.setWorkorderName(order.getWorkorderName());
proTask.setItemId(order.getProductId()); proTask.setItemId(order.getProductId());