agv 有单入库功能

zyx

2023-07-20 cb98548ecc0fa2d4388eb67528b98be39670bc0c

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

@@ -1,14 +1,13 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.AppAuthUtil;
import com.zy.common.web.BaseController;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -21,9 +20,9 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.EnumSet;

/**
@@ -54,10 +53,10 @@

    @PostMapping("/task/event/status")
    @AppAuth(memo = "ESS任务回调")
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param){
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){

        //保存每次调用该接口的参数，作为历史可查询
        //saveApiLog(param);
        //save api log (appkey 后续添加)
        AppAuthUtil.auth("test-appkey",param, request);

        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
        if(Cools.isEmpty(agvWrkMast)){
@@ -95,15 +94,6 @@
        return true;
    }

    private void saveApiLog(AgvTaskCallBackParam param){
        ApiLog apiLog = new ApiLog();
        apiLog.setNamespace("ESS任务回调");
        apiLog.setUrl("/agv/task/event/status");
        apiLog.setRequest(JSONObject.toJSONString(param));
        apiLog.setCreateTime(new Date());
        apiLogService.insert(apiLog);
    }

}

enum AgvTask{
@@ -114,27 +104,8 @@
    task{
        @Transactional
        public void success(AgvTaskCallBackParam param) {

            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),205);

            /*
            int wrkNo = Integer.valueOf(param.getTaskCode());
            String barcode = agvWrkMastService.selectById(wrkNo).getBarcode();
            //生成AGV工作历史档
            agvWrkMastLogService.save(wrkNo);
            //生成AGV工作明细历史档
            agvWrkDetlLogService.save(wrkNo);
            //删除AGV工作档
            agvWrkMastService.deleteById(wrkNo);
            //删除AGV工作明细档
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
            //生成入库通知历史档
            agvWaitPakinLogService.save(barcode);
            //删除入库通知档
            agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("zpallet",barcode));
             */

        }

        public void fail(AgvTaskCallBackParam param) {
@@ -203,14 +174,8 @@
    tote_unload{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
            int wrkNo = Integer.valueOf(param.getTaskCode());
            String barcode = agvWrkMastService.selectById(wrkNo).getBarcode();
            //修改目标库位状态为F.在库
            //agvLocMastService.updateLocStsByLocNo(param.getLocationCode(),"F");
            //更新目标库位明细
            //agvLocDetlService.addLocDetlInfo(param.getLocationCode(),wrkNo);
            //修改工作档状态为204.放货完成
            agvWrkMastService.updateWrkStsByWrkNo(wrkNo,204);
            agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),204);
        }

        public void fail(AgvTaskCallBackParam param) {