Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

6 分钟以前 f1f08a7174e53f375b341c9bd4be50f637db2c2e

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java

@@ -76,7 +76,8 @@
        } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_OBTAIN.type)){
            return issueTaskWcsHttpREQUEST(param);//待完善
        } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_NO_EXECUTE.type)){
            return issueTaskWcsHttpREQUEST(param);//待完善
//            return issueTaskWcsHttpREQUEST(param);//待完善
            return R.ok();
        }
        return R.error();
    }
@@ -95,14 +96,18 @@
            if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_IN.code)){
                wcsUrl = wcsUrl + WcsConstant.createInTask;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setLocNo(param.getLocNo());
                String[] split = param.getLocNo().split("-");
                String endLoc = split[2]+"-"+split[3]+"-"+split[4];
                missionWcsTaskIssueParam.setLocNo(endLoc);
                missionWcsTaskIssueParam.setBarcode(param.getBarcode());
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());

            } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_OUT.code)){
                wcsUrl = wcsUrl + WcsConstant.createOutTask;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setLocNo(param.getSourceCode());
                String[] split = param.getSourcelocNo().split("-");
                String souLoc = split[2]+"-"+split[3]+"-"+split[4];
                missionWcsTaskIssueParam.setLocNo(souLoc);
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
                missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//目标站
                missionWcsTaskIssueParam.setOutArea("");//目标区域
@@ -111,8 +116,12 @@
            } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_TRANSFER.code)){
                wcsUrl = wcsUrl + WcsConstant.createLocMoveTask;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setSourceLocNo(param.getSourcelocNo());
                missionWcsTaskIssueParam.setLocNo(param.getLocNo());
                String[] split1 = param.getSourcelocNo().split("-");
                String souLoc = split1[2]+"-"+split1[3]+"-"+split1[4];
                missionWcsTaskIssueParam.setSourceLocNo(souLoc);
                String[] split2 = param.getLocNo().split("-");
                String endLoc = split2[2]+"-"+split2[3]+"-"+split2[4];
                missionWcsTaskIssueParam.setLocNo(endLoc);
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
            } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_STA.code)){
                wcsUrl = wcsUrl + WcsConstant.STA_TO_STA;
@@ -121,11 +130,11 @@
                missionWcsTaskIssueParam.setSourceStaNo(Integer.parseInt(param.getSourcestaNo()));//目标站
            }
            /**WMS基础配置链接*/
            log.info("入库任务申请，请求地址： {}， 请求参数： {}", wcsUrl , JSONObject.toJSONString(param));
            log.info("入库任务申请，请求地址： {}， 请求参数： {}", wcsUrl , JSONObject.toJSONString(missionWcsTaskIssueParam));
            HttpHeaders headers = new HttpHeaders();
            headers.add("Content-Type", "application/json");
            headers.add("api-version", "v2.0");
            HttpEntity httpEntity = new HttpEntity(param, headers);
            HttpEntity httpEntity = new HttpEntity(missionWcsTaskIssueParam, headers);
            ResponseEntity<String> exchange = restTemplate.exchange(wcsUrl, HttpMethod.POST, httpEntity, String.class);
            log.info("WCS任务申请，响应结果： {}", exchange);
            if (Objects.isNull(exchange.getBody())) {