1
15 小时以前 4c418a889f3b3a0874eb7836d72a9abef174f79b
lsh#
5个文件已修改
44 ■■■■■ 已修改文件
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java
@@ -14,6 +14,10 @@
    private String taskNo;
    private String barcode;//条码
    private Integer taskPri;//优先级
    private String locNo;//目标库位
    private String sourcelocNo;//源库位
    private String staNo;//目标站点
    private String sourcestaNo;//源站点
    /*
     * 类型:出库、入库、移库、站到站
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java
@@ -77,4 +77,22 @@
     * */
    private String barcode;
    //入库 **********************************************************************
//    /**
//     * WMS任务号  工作号
//     */
//    private String taskNo;
//    /*
//     * 条码
//     * */
//    private String barcode;
    /*
     * 源站
     * */
    private Integer sourceStaNo;
//    /*
//     * 目标站(优先级高于出库区域)
//     * */
//    private Integer staNo;
}
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
@@ -95,7 +95,7 @@
            if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_IN.code)){
                wcsUrl = wcsUrl + WcsConstant.createInTask;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setLocNo(param.getTargetCode());
                missionWcsTaskIssueParam.setLocNo(param.getLocNo());
                missionWcsTaskIssueParam.setBarcode(param.getBarcode());
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
@@ -104,19 +104,21 @@
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setLocNo(param.getSourceCode());
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
                missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getTargetCode()));//目标站
                missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//目标站
                missionWcsTaskIssueParam.setOutArea("");//目标区域
                missionWcsTaskIssueParam.setBatch("");//出库批次号
                missionWcsTaskIssueParam.setBatchSeq(1);//出库顺序号
            } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_TRANSFER.code)){
                wcsUrl = wcsUrl + WcsConstant.createLocMoveTask;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setSourceLocNo(param.getSourceCode());
                missionWcsTaskIssueParam.setLocNo(param.getTargetCode());
                missionWcsTaskIssueParam.setSourceLocNo(param.getSourcelocNo());
                missionWcsTaskIssueParam.setLocNo(param.getLocNo());
                missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
            } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_STA.code)){
                wcsUrl = wcsUrl + WcsConstant.STA_TO_STA;
                missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
                missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//目标站
                missionWcsTaskIssueParam.setSourceStaNo(Integer.parseInt(param.getSourcestaNo()));//目标站
            }
            /**WMS基础配置链接*/
            log.info("入库任务申请,请求地址: {}, 请求参数: {}", wcsUrl , JSONObject.toJSONString(param));
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java
@@ -19,6 +19,12 @@
     * WMS任务号
     */
    private String taskNo;
    private String barcode;//条码
    private Integer taskPri;//优先级
    private String locNo;//目标库位
    private String sourcelocNo;//源库位
    private String staNo;//目标站点
    private String sourcestaNo;//源站点
    /*
    * 类型:出库、入库、移库、站到站
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -179,6 +179,12 @@
                    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;