|
@@ -28,9 +28,11 @@ import com.github.zuihou.business.operationManagementCenter.service.WorkpieceSer
|
|
|
import com.github.zuihou.business.productionReadyCenter.dao.AAutoNodeLogMapper;
|
|
|
import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
|
|
|
import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureMapper;
|
|
|
+import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureProgramMapper;
|
|
|
import com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog;
|
|
|
import com.github.zuihou.business.productionReadyCenter.entity.BBom;
|
|
|
import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
|
|
|
+import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProgram;
|
|
|
import com.github.zuihou.business.productionReadyCenter.service.AAutoNodeLogService;
|
|
|
import com.github.zuihou.business.productionReadyCenter.service.BomProcedureProductionresourceService;
|
|
|
import com.github.zuihou.business.productionReadyCenter.service.BomProcedureService;
|
|
@@ -163,6 +165,9 @@ public class TaskWorkNode {
|
|
|
@Autowired
|
|
|
private ParameterService parameterService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private BomProcedureProgramMapper bomProcedureProgramMapper;
|
|
|
+
|
|
|
//总控端口
|
|
|
private final String ZK_port = "120";
|
|
|
|
|
@@ -1203,6 +1208,26 @@ public class TaskWorkNode {
|
|
|
|
|
|
Map locationMap = new HashMap();
|
|
|
locationMap.put("location", targetStorge.getPointId());
|
|
|
+
|
|
|
+ if(taskNode.getTargetResourceId() !=null){
|
|
|
+ Productionresource productionresource = productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
|
|
|
+ if(!Objects.isNull(productionresource) && StringUtil.isNotEmpty(productionresource.getModeSpecification()) && productionresource.getModeSpecification().contains("HELLER")){
|
|
|
+
|
|
|
+ List<BomProcedureProgram>procedureProgramList = bomProcedureProgramMapper.selectList(Wraps.<BomProcedureProgram>lbQ().eq(BomProcedureProgram::getProcedureId,task.getProcedureId()));
|
|
|
+
|
|
|
+ List<Map<String, String>> fileList = new ArrayList<Map<String, String>>();
|
|
|
+ if (procedureProgramList != null && procedureProgramList.size() > 0) {
|
|
|
+ //文件上传只允许单个文件
|
|
|
+ procedureProgramList.forEach(i -> {
|
|
|
+ Map<String, String> m = new HashMap<>();
|
|
|
+ m.put("fileName", i.getSubmittedFileName());
|
|
|
+ fileList.add(m);
|
|
|
+ });
|
|
|
+ locationMap.put("fileName",fileList.get(0).get("fileName"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
dataMap.put("data", locationMap);
|
|
|
|
|
|
dataMap.put("toStorge", targetStorge);
|