#1。档案同步2，任务状态上报，3设备状态读取，4心跳，5wms手动完成取消任务

lty

22 小时以前 caa7a2327123cc070ae16ad802983c04e296ff11

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

@@ -1,11 +1,16 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +21,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.HashMap;

/**
 * Created by vincent on 2022/4/8
@@ -34,6 +41,10 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private WorkService workService;
    @Autowired
    private WrkMastServiceImpl wrkMastService;

    @PostMapping("/order/matSync/default/v2")
//    @AppAuth(memo = "商品信息同步接口")
@@ -429,4 +440,30 @@
        return R.error("任务号不存在");
    }

    /**
     * 心跳接口
     */
    @PostMapping("/wmsHeartbeat")
    public R heartbeat(@RequestBody Map<String, Object> param) {
        if (param != null && param.get("timeStamp") != null) {
            return R.ok("操作成功");
        }
        return R.error("失败");
    }

    @RequestMapping("/taskCancel")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestHeader(required = false) String appkey,@RequestBody TaskCancelParam taskCancelParam,HttpServletRequest request){
        auth(appkey, taskCancelParam, request);

        if (taskCancelParam.getTaskStatus() == 2) {
            workService.completeWrkMast(taskCancelParam.getTaskNo(),null);
            return R.ok("工作档已完成");
        } else if (taskCancelParam.getTaskStatus() == 1) {
            workService.cancelWrkMast(taskCancelParam.getTaskNo(), null);
            return R.ok("工作档已取消");
        }
        return R.ok();
    }

}