#

luxiaotao1123

2024-09-23 43f2fe7fa6ec90b957d3182730e5c726b7158ced

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

@@ -93,7 +93,11 @@

    @SuppressWarnings("all")
    @Transactional
    public void generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
    public Bus generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
        String errorMsg = busService.checkoutValid(busSubmitParam);
        if (!Cools.isEmpty(errorMsg)) {
            throw new BusinessException(errorMsg);
        }
        String batch = busSubmitParam.getBatch();
        List<TaskDto> taskDtoList = busSubmitParam.getTaskList();
        if (Cools.isEmpty(taskDtoList)) {
@@ -110,7 +114,7 @@
        Date now = new Date();
        Bus bus = new Bus();
        bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        bus.setSeqNum(batch);
        bus.setBusNo(batch);
        bus.setStartTime(now);
        bus.setBusSts(BusStsType.RECEIVE.val());
        bus.setMemo(memo);
@@ -183,7 +187,7 @@
            }

        }

        return bus;
    }

    /**
@@ -255,7 +259,7 @@
                throw new CoolException("generate [task] action fail, cause can not acquire lock ...");
            }
            Date now = new Date();
            final String sameGroupXy = configService.getVal( "sameGroupXy");
            final String sameGroupXy = configService.getVal( "sameGroupXy", String.class);

            Agv agv = agvService.getById(agvId);
            if (!agvService.judgeEnable(agv.getId(), agvDetail -> agvDetail.getVol() > agv.getChargeLine())) {
@@ -590,7 +594,7 @@
        try {
            if (Cools.isEmpty(agvId, segmentList)) { return; }
            Date now = new Date();
            JSONObject storeDirection = JSON.parseObject(configService.getVal("storeDirection"));
            JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
            Agv agv = agvService.getById(agvId);
            if (!agvService.judgeEnable(agv.getId())) {
                throw new CoolException("AGV[" + agv.getUuid() + "]当前不可用...");