111

zc

7 天以前 11d4e7383093190ee85d59d198f0e3b5ba428c91

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -18,6 +18,7 @@
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
@@ -28,10 +29,12 @@
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.utils.HttpHandler;
import com.zy.acs.manager.manager.controller.param.LocSiteParams;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.manager.service.impl.LocStsServiceImpl;
import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
import com.zy.acs.manager.manager.utils.ActionSorter;
import com.zy.acs.manager.system.service.ConfigService;
@@ -104,6 +107,8 @@
    private TaskReportService taskReportService;
    @Autowired
    private AgvDurationService agvDurationService;
    @Autowired
    private LocStsService locStsService;

    @SuppressWarnings("all")
    @Transactional
@@ -973,7 +978,8 @@
                        assert backpackType != null;
                        // 检验方向
                        if (!lastDirection.equals(workDirection)) {
                            throw new CoolException(agvNo + "号小车方向错误，请推至转弯点手动调整");
                            lastDirection = workDirection;
//                            throw new CoolException(agvNo agvNo+ "号小车方向错误，请推至转弯点手动调整");
                        }
                        // 货架取货
                        Loc oriLoc = locService.getById(task.getOriLoc());
@@ -2407,4 +2413,41 @@
        }
        return false;
    }

    /**
     * @author Ryan
     * @date 2025/11/10
     * @description: 修改库位状态
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public R modifyStatus(LocSiteParams params) {
        if (Objects.isNull(params.getStatus())) {
            return R.error("修改状态不能为空！！");
        }
        LocSts locSts = locStsService.getOne(new LambdaQueryWrapper<LocSts>().eq(LocSts::getUuid, params.getStatus()));
        if (Objects.isNull(locSts)) {
            return R.error("数据错误，未找到对应工作状态！！");
        }
        if (!params.getType().equals("loc")) {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, params.getCode()));
            if (Objects.isNull(loc)) {
                return R.error("库位信息不存在！！");
            }
            loc.setLocSts(locSts.getId());
            if (!locService.updateById(loc)) {
                return R.ok("库位状态修改失败！！");
            }
        } else {
            Sta sta = staService.getOne(new LambdaQueryWrapper<Sta>().eq(Sta::getStaNo, params.getCode()));
            if (Objects.isNull(sta)) {
                return R.error("站点信息不存在！！");
            }
            sta.setStatus(locSts.getStatus());
            if (!staService.updateById(sta)) {
                return R.error("站点状态修改失败！！");
            }
        }
        return R.ok();
    }
}