Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -45,9 +45,6 @@
    @Value("${agv.containerArrivedPath}")
    private String containerArrivedPath;

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;

    @Autowired
    AgvWrkMastMapper agvWrkMastMapper;
    @Autowired
@@ -182,7 +179,12 @@
            if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            }
            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());

            if(agvWrkMast.getLocNo().contains("SK")){
                agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
            }else {
                agvTaskkDescribeParam.setToStationCode(agvWrkMast.getLocNo());
            }
            agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
            return agvTaskParam;
        }).collect(Collectors.toList());