#

zjj

2024-06-30 69ddcd7014dcf6fd9a4e85e52665a9f5515e3445

#

 zy-asrs-flow/public/img/logo-dark.png

 zy-asrs-flow/public/img/logo.png

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -30,8 +30,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 对外暴露接口
@@ -61,6 +60,176 @@
    private BasConveyorService basConveyorService;
    @Autowired
    private BasConveyorStaService basConveyorStaService;


    @PostMapping("/cancelWcsTask")
    public HashMap<String,Object> cancelWcsTask(@RequestBody CreateWcsTaskParam param){
        HashMap<String, Object> map = new HashMap<>();
        if (Cools.isEmpty(param)){
            map.put("success", "0");
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        if (Cools.isEmpty(param.getRequestPK()) || Cools.isEmpty(param.getContNo()) ){
            map.put("success", "0");
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, param.getRequestPK()).eq(Task::getHostId,1L));
        if (task == null){
            map.put("success", "0");
            map.put("message", "失败，未找到相同编号的任务");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        if (task.getTaskSts() == 1 || task.getTaskSts() == 101){
            boolean remove = false;
            try {
                remove = taskService.removeById(task);
            }catch (Exception e){
                map.put("success", "0");
                map.put("message", "取消任务失败:"+e.getMessage());
                map.put("result", "");
                map.put("requestPK",param.getRequestPK());
                return map;
            }finally {
                if (remove){
                    map.put("success", "1");
                    map.put("message", "取消任务成功");
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }else {
                    map.put("success", "0");
                    map.put("message", "取消任务失败");
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }
            }
        }else {
            map.put("success", "0");
            map.put("message", "失败，任务已执行");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        return map;

    }


    //mes下发任务
    @PostMapping("/createWcsTaskParam")
    public HashMap<String,Object> createWcsTask(@RequestBody CreateWcsTaskParam param){
        HashMap<String, Object> map = new HashMap<>();
        if (Cools.isEmpty(param)){
            map.put("success", "0");
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        if (Cools.isEmpty(param.getRequestPK()) || Cools.isEmpty(param.getContNo()) || Cools.isEmpty(param.getTrkPrty()) || Cools.isEmpty(param.getToPos())){
            map.put("success", "0");
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }

        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, param.getRequestPK()).eq(Task::getHostId,1L));
        if(task != null){
            map.put("success", "0");
            map.put("message", "失败，存在相同编号的任务");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            return map;
        }
        ArrayList<String> inlist = new ArrayList<>();
        inlist.add("1");inlist.add("8");
        ArrayList<String> outlist = new ArrayList<>();
        outlist.add("2");outlist.add("9");
        if (inlist.contains(param.getTrkType())){
            CreateInTaskParam createInTaskParam = new CreateInTaskParam();
            createInTaskParam.setTaskNo(param.getRequestPK());
            createInTaskParam.setDestLoc(getWMStoWCSLocNo(param.getToPos()));
            createInTaskParam.setOriginSite("100");
            createInTaskParam.setBarcode(param.getContNo());
            createInTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
            R inTask = null;
            try {
                inTask = createInTask(createInTaskParam);
            }catch (Exception e){
                map.put("success", "0");
                map.put("message", "生成任务出错");
                map.put("result", "");
                map.put("requestPK", param.getRequestPK());
                return map;
            }finally {
                int code = (int) inTask.get("code");
                if (code == 200){
                    map.put("success", "1");
                    map.put("message", inTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }else {
                    map.put("success", "0");
                    map.put("message", inTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }
            }
        } else if (outlist.contains(param.getTrkType())) {
            CreateOutTaskParam createOutTaskParam = new CreateOutTaskParam();
            createOutTaskParam.setTaskNo(param.getRequestPK());
            createOutTaskParam.setOriginLoc(getWMStoWCSLocNo(param.getFrmPos()));
            createOutTaskParam.setOriginSite("101");
            createOutTaskParam.setDestSite("100");
            createOutTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
            R outTask = null;
            try {
                outTask = createOutTask(createOutTaskParam);
            }catch (Exception e){
                map.put("success", "0");
                map.put("message", "生成任务出错");
                map.put("result", "");
                map.put("requestPK", param.getRequestPK());
                return map;
            }finally {
                int code = (int) outTask.get("code");
                if (code == 200){
                    map.put("success", "1");
                    map.put("message", outTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }else {
                    map.put("success", "0");
                    map.put("message", outTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }
            }

        }else {
            map.put("success", "0");
            map.put("message", "未找到对应任务类型");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
        }
        return map;
    }
    public static String getWMStoWCSLocNo(String loc){
        String locNo = "";
        int row = Integer.parseInt(loc.substring(6,8));
        int bay = Integer.parseInt(loc.substring(8,10));
        int lev = Integer.parseInt(loc.substring(10,12));
        locNo = row +"-"+bay+"-"+lev;
        return locNo;
    }

    //生成入库任务
    @PostMapping("/createInTask")
@@ -507,4 +676,9 @@
        return R.ok();
    }

    public static void main(String[] args) {
        String wmStoWCSLocNo = getWMStoWCSLocNo("0601KW010101");
        System.out.println(wmStoWCSLocNo);
    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/param/CreateWcsTaskParam.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/entity/param/CreateWcsTaskParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.asrs.entity.param;
package com.zy.asrs.wcs.core.domain.param;

import lombok.Data;

@@ -19,7 +19,7 @@
    private String isFull; //容器空满状态
    private String contType; //容器类型
    private String operator; //上位系统名
    private String operationTime; //任务下发时间
    private Long operationTime; //任务下发时间




 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java

@@ -17,6 +17,7 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
@@ -372,6 +373,9 @@
            if (shuttleProtocol == null) {
                continue;
            }
            if (shuttleProtocol.getProtocolStatusType() == ShuttleProtocolStatusType.OFFLINE){
                continue;
            }

            if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) == lev) {
                if (shuttleProtocol.getHasCharge()) {