lsh#

1

昨天 87273850776e1a3bec1124af3ab51355d16b0d95

lsh#

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/MissionTransferStationController.java

@@ -18,6 +18,7 @@
    @ApiOperation("任务总控")
    @PostMapping("/task/master/control")
    public CommonResponse missionMasterControl(@RequestBody Object objParams) {
        System.out.println("111");
        //判断需要下发系统
        //判断下发方式
        //返回结果

 rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java

@@ -54,6 +54,20 @@

    }

    @Data
    @Configuration
    @ConfigurationProperties(prefix = "platform.open.api")
    public class WmsOpenApi {
        /**
         * 调用路径
         */
        private String host;

        /**调用端口**/
        private String port;

    }


    public String getBaseUrl() {
        return  this.host + ":" + this.port + "/" + this.prePath;

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

@@ -96,6 +96,8 @@
    @Autowired
    private RemotesInfoProperties.RcsApi rcsApi;
    @Autowired
    private RemotesInfoProperties.WmsOpenApi wmsOpenApi;
    @Autowired
    private BasStationService basStationService;
    @Autowired
    private FlowStepInstanceServiceImpl flowStepInstanceService;
@@ -112,7 +114,8 @@
     */
    @Scheduled(cron = "0/2 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void missionTaskEXECUTE() {
    public synchronized void missionTaskEXECUTE() {
        try{
        List<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
                .eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
        for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
@@ -166,10 +169,10 @@
                }
            } else {
                /**任务下发接口*/
                String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.MISSION_TRANSFER_STATION;
                    String pubTakUrl = wmsOpenApi.getHost() + ":" + wmsOpenApi.getPort() + RcsConstant.MISSION_TRANSFER_STATION;

                /**基础配置链接*/
                log.info("任务下发，请求地址： {}， 请求参数： {}", pubTakUrl, JSONObject.toJSONString(""));
                    log.info("任务下发，请求地址： {}， 请求参数： {}", pubTakUrl, JSONObject.toJSONString(flowStepInstance));
                HttpHeaders headers = new HttpHeaders();
                headers.add("Content-Type", "application/json");
                headers.add("api-version", "v2.0");
@@ -229,6 +232,9 @@
                }
            }
        }
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
    }


@@ -256,7 +262,7 @@
            }
            for (Task task : tasks) {
                /**任务下发接口*/
                String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_TASKS;
                String pubTakUrl = wmsOpenApi.getHost() + ":" + wmsOpenApi.getPort() + RcsConstant.REPORT_TASKS;

                /**基础配置链接*/
                log.info("任务上报，请求地址： {}， 请求参数： {}", pubTakUrl, JSONObject.toJSONString(""));

 rsf-server/src/main/resources/application-dev.yml

@@ -90,6 +90,15 @@
    #端口
    port: 8081

  #企业ERP平台
  open:
    #接口明细
    api:
      #localhost
      host: http://127.0.0.1
      #端口号
      port: 8081

#仓库功能参数配置
stock:
  #是否允许打印货物标签， 默认允许打印，也可由供应商提供标签

 rsf-server/src/main/resources/application-prod.yml

@@ -84,6 +84,14 @@
      #端口
      port: 8081

    #企业ERP平台
    open:
      #接口明细
      api:
        #localhost
        host: http://127.0.0.1
        #端口号
        port: 8081
#仓库功能参数配置
stock:
  #是否允许打印货物标签， 默认允许打印，也可由供应商提供标签