#

lty

2 天以前 102a41a8d5c231dd306bad622344e98312c1a774

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -11,6 +11,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -331,6 +332,33 @@


    /**
     * 托盘就绪状态查询
     */
    @PostMapping("/arm/task/loc_status")
    @AppAuth(memo = "托盘就绪状态查询")
    public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
                                                 @RequestBody ArmOKParam param,
                                                 HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getArmNo())) {
            return R.error("机械臂编号[armNo]不能为空");
        }
        if (Cools.isEmpty(param.getStaNo())) {
            return R.error("站点编号[staNo]不能为空");
        }

        boolean taskArmLocStatus = openService.TaskArmLocStatus(param);
        if (taskArmLocStatus){
            return new R(200,"OK").add(true);
        }
        return R.error("不符合").add(false);
    }


    /**
     * 异常上报
     */
    @PostMapping("/armAbnormalOperation")
@@ -372,6 +400,9 @@
            param.OrderIdTwo(sign_arm_order,sign_arm_sku);
        } catch (Exception e){
            return R.error("单据编号[order_id]以 "+sign_arm_sku+" 与 "+sign_arm_order+" 作为拆分标记拆分失败！！！");
        }
        if (param.getArm_no()>4){
            return R.ok();
        }

        openService.taskArmWorkOrderStatus(param);
@@ -447,13 +478,10 @@
        }

        param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));

//        if (Cools.isEmpty(param.getTimestamp())) {
//            return R.error("RGV任务号[timestamp]不能为空");
//        }
        boolean taskAgvReport = openService.TaskAgvReport(param);
        if (taskAgvReport){
            return R.ok();
            agvBindAndBin(String.valueOf(param.getTaskNo()));
            return new R(0,"成功");
        }
        return R.error("任务号不存在");
    }
@@ -541,9 +569,30 @@
            }
        }
        if (bindCtnrAndBin) {
            asyncProcessAfterValidation(param);
            return new R(0,"成功");
        }
        return R.error("库位不存在或无明细");
    }

    @Async
    public void agvBindAndBin(String taskNo) {
        try {
            Thread.sleep(500);
            openService.agvBindAndBin(taskNo);
        } catch (Exception e) {
            log.error("异步处理AGV搬运后续逻辑失败", e);
        }
    }

    @Async
    public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
        try {
            Thread.sleep(500);
            openService.agvApplicationPassedTheGrating(param);
        } catch (Exception e) {
            log.error("异步处理AGV光栅后续逻辑失败", e);
        }
    }

}