#

zjj

2023-12-11 c8b2322c5c43b6e627ff724405281bc53c6c98f5

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

@@ -59,7 +59,7 @@


    @Override
    public void taskCreate(taskCreateParam param) {
    public R taskCreate(taskCreateParam param) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
        if (taskWrk != null) {
            throw new CoolException(param.getTaskNo() + "任务已存在，请勿重复提交");
@@ -79,25 +79,30 @@
        taskWrk.setCrnNo(param.getCrn());
        if(param.getIoType() == 1){
            taskWrk.setWrkSts(1);
            if (!Cools.isEmpty(param.getTargetPoint())) {
                taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//终点
                taskWrk.setOriginTargetPoint(param.getTargetPoint());
            }

        } else if (param.getIoType() == 2) {
            taskWrk.setWrkSts(11);
            if (!Cools.isEmpty(param.getStartPoint())) {
                taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//起点
                taskWrk.setOriginStartPoint(param.getStartPoint());
            }
            taskWrk.setTargetPoint(param.getTargetPoint());
        }

        if (!Cools.isEmpty(param.getStartPoint())) {
            taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//起点
            taskWrk.setOriginStartPoint(param.getStartPoint());
        }
        if (!Cools.isEmpty(param.getTargetPoint())) {
            taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//终点
            taskWrk.setOriginTargetPoint(param.getTargetPoint());
        }


        if (!Cools.isEmpty(param.getMemo())) {
            taskWrk.setMemo(param.getMemo());//备注
        }

        if (!taskWrkService.insert(taskWrk)) {
            throw new CoolException("生成任务失败，请联系管理员");
            return R.error("创建任务失败");
        }
        return R.ok();
    }

    @Override
@@ -179,14 +184,6 @@

    @Override
    public void getAgvTaskOver(TaskOverParam param) {
//        Map<String,Integer> map = new HashMap<>();
//        put("J-1101",102);put("J-1102",101);
//        put("J-1103",106);put("J-1104",105);
//        put("J-1105",110);put("J-1106",109);
//        put("J-1107",114);put("J-1108",113);
//        put("J-1109",118);put("J-1110",117);
//        put("J-1111",122);put("J-1112",121);
//        put("H-1101",305);put("H-1102",300);
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()