#ZH

野心家

2025-05-26 3d40ce7e16a9e53bad6637bbed824507f06148b4

 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")
@@ -491,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());
@@ -501,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()) {
@@ -518,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)){
@@ -541,19 +552,43 @@
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());
                BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());

                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            list.add(basRgvWmsParam);
            if (rgvStatus.getMode()!=1){
                basRgvWmsParam.setSteErr(999L);
                basRgvWmsParam.setSteErrM("非自动！！！");
            }
//            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);
    }