lsh#

1

5 小时以前 f84b757103683b1c7b19fa7d6ac9bf55b8512efc

lsh#

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

@@ -96,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("");//目标区域
@@ -112,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;
@@ -122,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())) {

 rsf-open-api/src/main/resources/application-dev.yml

@@ -66,7 +66,7 @@
  #WCS链接
  wcs:
    #链接
    host: http://192.168.4.178
    host: http://192.168.4.198
    #端口
    port: 9090
  #WCS链接

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java

@@ -11,7 +11,7 @@
    private List<Long> type;

    private Long orderItemId;//订单明细ID
    private Long waveId = 16L;//出库策略
    private Long waveId = 15L;//出库策略
    private List<Detl> detlList;
    class Detl{
        private String loc_no;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -988,8 +988,14 @@
                    //110.空板出库
                    complateOutStockEmpty(task, loginUserId);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)) {
                    //110.空板出库
                    //109.越库
                    complateOutStockDocking(task, loginUserId);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
                    //107.盘
                    pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
                    //103.拣选
                    pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_PICK);
                } else {
                    complateOutStock(task, loginUserId);
                }
@@ -1362,7 +1368,7 @@
        task.setTaskCode(ruleCode)
                .setTaskType(type)
                .setBarcode(task.getBarcode())
                .setTaskStatus(TaskStsType.GENERATE_IN.id);
                .setTaskStatus(TaskStsType.MISSION_INITIAL.id);

        TaskInParam param = new TaskInParam();
        param.setSourceStaNo(task.getTargSite())
@@ -1617,7 +1623,7 @@
    /**
     * @author Ryan
     * @date 2025/5/20
     * @description: 完成出库任务，更新出库库存信息
     * @description: 完成越库任务，更新出库库存信息
     * @version 1.0
     */
    @Synchronized