|
@@ -122,13 +122,15 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
|
|
|
|
|
|
private List<TaskNode> addSupportNodes(List<TaskNode> supportNodes, boolean isHeader, Long taskId, List<TaskNode> taskNodeList,TaskNode lastNode, String zoneName){
|
|
|
List<TaskNode> dataList = dozer.mapList(supportNodes, TaskNode.class);
|
|
|
+
|
|
|
dataList.forEach(item->{
|
|
|
item.setTaskId(taskId).setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE))
|
|
|
.setExeStatus("1").setPrority(lastNode.getPrority()+1+taskNodeList.size());
|
|
|
if(isHeader){
|
|
|
item.setNodeName("抽检:"+item.getNodeName());
|
|
|
}else{
|
|
|
- if(item.getAutoNode().isFinal()){
|
|
|
+ TaskNode finalNode = dataList.get(dataList.size()-1);
|
|
|
+ if(item == finalNode){
|
|
|
item.setNodeName("抽检:运到"+ zoneName +"线接驳位");
|
|
|
}else{
|
|
|
item.setNodeName("抽检:"+item.getNodeName());
|
|
@@ -168,7 +170,7 @@ public class InspectionServiceImpl extends SuperServiceImpl<InspectionMapper, In
|
|
|
|
|
|
//获取产线名称
|
|
|
String zoneNo = zoneService.getById(model.getZoneId()).getNo();
|
|
|
- String zoneName = (zoneNo=="capsule")? "舱体":((zoneNo=="framework")? "框体": "保障中心");
|
|
|
+ String zoneName = zoneNo.equals("capsule")? "舱体":((zoneNo.equals("framework")? "框体": "保障中心"));
|
|
|
|
|
|
BomProcedure bomProcedure = bomProcedureService.getById(task.getProcedureId());
|
|
|
|