#ZH

野心家

2025-05-27 1b9f41e12e3ee8ac8bbc388eab7585300bdab75a

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
@@ -70,6 +71,8 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    @Autowired
    private TaskWrkLogServiceImpl taskWrkLogService;

    //agv任务完成
    @PostMapping("/toAgvTaskOver")
@@ -92,7 +95,7 @@
    }

    //创建任务
    @PostMapping("/taskCreate")
    @PostMapping("/taskCreate2")
    @AppAuth(memo = "WMS任务下发")
    @Transactional
    public synchronized R taskCreate(@RequestHeader String appkey,
@@ -332,9 +335,9 @@
    }

    //任务下发接口
    @PostMapping("/outboundTaskSend")
//    @PostMapping("/taskCreate")
//    @AppAuth(memo = "任务下发接口")
//    @PostMapping("/outboundTaskSend")
    @PostMapping("/taskCreate")
    @AppAuth(memo = "任务下发接口")
    @Transactional
    public R outboundTaskSend(@RequestHeader String appkey,
                              @RequestBody List<CarryParam> params,//中航下发  1：出库，2：移库 3：入库
@@ -343,7 +346,7 @@
//        List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
        for (CarryParam param:params){
            param.updateIoTyoe(param.getIoType());//中航下发  1：出库，2：移库 3：入库   ====转换为====>  1：入库，2：出库，3：移库

            param.updateLocNo();
            if (Cools.isEmpty(param)){
                return R.error("参数为空！");
            } else if (Cools.isEmpty(param.getTaskNo())){
@@ -366,7 +369,14 @@
//                }
//            }

            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());

            String locNo=null;
            if(param.getIoType()==1){
                locNo=param.getTargetPoint();
            }else{
                locNo=param.getStartPoint();
            }
            LocMast locMast = locMastService.selectByLocNo(locNo);
            if(Cools.isEmpty(locMast)){
                return R.error("初始库位无法找到");
            }
@@ -382,7 +392,7 @@
                if(Cools.isEmpty(staDesc)){
                    return R.error("入库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));

            }else if(param.getIoType() == 2){
                //出库任务创建
@@ -393,7 +403,7 @@
                if(Cools.isEmpty(staDesc)){
                    return R.error("出库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
            }else if (param.getIoType() == 3){
                LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
                if(Cools.isEmpty(locMast2)){
@@ -484,6 +494,7 @@
        auth(appkey, "设备状态查询接口", request);
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel();
        for (BasDevp basDevp:basDevps){
            BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
            basDevpWmsParam.setDevNo(basDevp.getDevNo());
@@ -494,7 +505,8 @@
            basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
            basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
            basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
            list.add(basDevpWmsParam);
//            list.add(basDevpWmsParam);
            wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
        }
        List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
        for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -511,17 +523,23 @@
            basCrnpWmsParam.sync(basCrnp);

            basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
            basCrnpWmsParamList.add(basCrnpWmsParam);
            basCrnpWmsParam.setCrnSts(crnProtocol.getStatus().intValue());

            try{
                BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
                BasCrnError basCrnError = basCrnErrorService.selectById(crnProtocol.getAlarm());
                basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }
            if (crnProtocol.getMode()!=3){
                basCrnpWmsParam.setCrnErr(999L);
                basCrnpWmsParam.setCrnErrM("非自动！！！");
            }
            basCrnpWmsParamList.add(basCrnpWmsParam);

            list.add(basCrnpWmsParam);
//            list.add(basCrnpWmsParam);
        }
        wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
            if (Cools.isEmpty(rgvStatus)){
@@ -533,20 +551,45 @@
            basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());

                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            basRgvWmsParam.setSteErrM(rgvStatus.getAlarmM());
//            try{
//                BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());
//
//                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
//            } catch (Exception e){
//                basRgvWmsParam.setSteErrM("未知异常");
//            }
            if (rgvStatus.getMode()!=1){
                basRgvWmsParam.setSteErr(999L);
                basRgvWmsParam.setSteErrM("非自动！！！");
            }
            list.add(basRgvWmsParam);
//            list.add(basRgvWmsParam);
            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);

        }
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
//        for (BasCrnp basCrnp:basCrnps){
//            list.add(basCrnp);
//        }
        return R.ok(list);
        return R.ok(wcsStatusResponseModel);
    }

    //设备状态查询接口
    @PostMapping("/taskWrkLogs")
    @Transactional
    public R taskWrkLogs(@RequestHeader String appkey,
                          HttpServletRequest request) {
        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
        return R.ok(taskWrkLogs);
    }

    //设备状态查询接口
    @PostMapping("/error")
    @Transactional
    public R errorRgv(@RequestHeader String appkey,
                      HttpServletRequest request) {
        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
        return R.ok(taskWrkLogs);
    }