lsh#

1

8 小时以前 4c418a889f3b3a0874eb7836d72a9abef174f79b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -15,6 +15,7 @@
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
import com.vincent.rsf.server.api.entity.CommonResponse;
import com.vincent.rsf.server.api.entity.constant.RcsConstant;
import com.vincent.rsf.server.api.entity.params.MissionTaskIssueParam;
import com.vincent.rsf.server.api.entity.params.TaskItemParam;
import com.vincent.rsf.server.api.entity.params.WcsTaskParams;
import com.vincent.rsf.server.api.utils.LocUtils;
@@ -28,10 +29,7 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.impl.FlowInstanceServiceImpl;
import com.vincent.rsf.server.system.service.impl.FlowStepInstanceServiceImpl;
import com.vincent.rsf.server.system.service.impl.TaskInstanceNodeServiceImpl;
import com.vincent.rsf.server.system.service.impl.TaskInstanceServiceImpl;
import com.vincent.rsf.server.system.service.impl.*;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.extern.slf4j.Slf4j;
@@ -107,6 +105,10 @@
    private TaskInstanceNodeServiceImpl taskInstanceNodeService;
    @Autowired
    private TaskInstanceServiceImpl taskInstanceService;
    @Autowired
    private SubsystemFlowTemplateServiceImpl subsystemFlowTemplateService;
    @Autowired
    private FlowStepTemplateServiceImpl flowStepTemplateService;


    /**
@@ -168,6 +170,21 @@
                        throw new CoolException(e.getMessage());
                    }
                } else {
                    SubsystemFlowTemplate subsystemFlowTemplate = subsystemFlowTemplateService.getById(flowInstance.getFlowTemplateId());
                    FlowStepTemplate flowStepTemplate = flowStepTemplateService.getById(flowStepInstance.getStepTemplateId());

                    MissionTaskIssueParam missionTaskIssueParam = new MissionTaskIssueParam(flowStepInstance,subsystemFlowTemplate,flowStepTemplate);

                    missionTaskIssueParam.setType(RcsTaskType.getTypeDesc(task.getTaskType()));

                    missionTaskIssueParam.setSourceCode(taskInstance.getSourceCode());
                    missionTaskIssueParam.setTargetCode(taskInstance.getTargetCode());
                    missionTaskIssueParam.setLocNo(task.getTargLoc());
                    missionTaskIssueParam.setSourcelocNo(task.getOrgLoc());
                    missionTaskIssueParam.setSourcestaNo(task.getOrgSite());
                    missionTaskIssueParam.setStaNo(task.getTargSite());
                    missionTaskIssueParam.setBarcode(task.getBarcode());
                    missionTaskIssueParam.setTaskPri(task.getSort());
                    /**任务下发接口*/
                    String pubTakUrl = wmsOpenApi.getHost() + ":" + wmsOpenApi.getPort() + RcsConstant.MISSION_TRANSFER_STATION;

@@ -176,7 +193,7 @@
                    HttpHeaders headers = new HttpHeaders();
                    headers.add("Content-Type", "application/json");
                    headers.add("api-version", "v2.0");
                    HttpEntity httpEntity = new HttpEntity(flowStepInstance, headers);
                    HttpEntity httpEntity = new HttpEntity(missionTaskIssueParam, headers);
                    ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
                    log.info("任务下发后，响应结果： {}", exchange);
                    if (Objects.isNull(exchange.getBody())) {