出库修改

pjb

2025-03-10 4e8b7012320bd30c1acfb36d20d7564c22890aa9

出库修改

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java

@@ -6,20 +6,27 @@
import org.springframework.boot.context.properties.ConfigurationProperties;

import org.springframework.stereotype.Component;



@Data

//@ConfigurationProperties(prefix = "rcs")

@Component

@Data

public class SystemProperties {



    /***RCS基础API HOST*/

    @Value("${rcs.baseHost}")

    private String baseHost;

    /***RRCS上报任务状态*/



    /***RCS上报任务状态*/

    @Value("${rcs.issueTaskOfEvent}")

    private String issueTaskOfEvent;



    /**RCS通知传输线流动*/

    @Value("${rcs.conveyorStart}")

    private String conveyorStart;



    /**ESS接收任务下发接口*/

    @Value("${rcs.essReceiveTask}")

    private String essReceiveTask;



    private static String HOST = "http://localhost:8080";

//

//    public static String ISSUE_TASK_OF_EVENT = HOST +  "/task/create";


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -33,6 +33,7 @@
import org.springframework.util.MultiValueMap;

import org.springframework.web.client.RestTemplate;



import javax.annotation.Resource;

import java.util.*;

import java.util.stream.Collectors;



@@ -49,6 +50,8 @@
    @Autowired

    private WorkService workService;



    @Resource

    private SystemProperties properties;



    /***

     * 入库任务---通知ESS输送线流动

@@ -277,8 +280,6 @@
        });



        tasksParam.setTaskType("carry");

        // TODO 多任务多订单，统一调度，是否会出现部分成功，部分失败的情况

        SystemProperties properties = new SystemProperties();

        log.info("请求地址：{}，请求参数：{}", properties.getBaseHost() + properties.getEssReceiveTask(), JSONObject.toJSONString(tasksParam));

        HttpHeaders headers = new HttpHeaders();

        headers.add("Content-Type", "application/json");


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java

@@ -126,8 +126,10 @@
                .eq(Task::getTaskNo, callbackParam.getTaskCode()));

        if (!Collections.isEmpty(list)) {

            list.forEach(task -> {

                // ESS只能配置一个状态上报接口，根据任务号判断是入库任务或出库任务

                String taskType = task.getTaskType() > 100 ? "outStock":"inStock";

                TaskStsType taskStsType = null;

                if (stockType.equals("inStock")) { //入库任务

                if (taskType.equals("inStock")) { //入库任务

                    if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态

                        if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {

                            taskStsType = TaskStsType.WCS_TOTE_LOAD;


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -1101,7 +1101,7 @@
            task.setTaskType(taskType);

            task.setIoPri(workService.generateIoPri(taskType));

            task.setOriginLoc(loc.getLocNo());

            task.setTargetSite(operationPort.getMemo());

            task.setTargetSite(operationPort.getFlag());

            task.setBarcode(loc.getBarcode());

            boolean res = taskService.save(task);

            if (!res) {