Merge remote-tracking branch 'origin/master'

wangfei

2024-11-20 0aacd330fca570ab3350aef5bda901f23aee23b3

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java

@@ -95,6 +95,10 @@
        }
        //任务暂停
        LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
        if (0 == task.getInkageState()) {
            log.info("{}上片线，处于离线状态：{}，结束本地上片请求", deviceId, task.getInkageState());
            return;
        }
        if (task.getTaskRunning().equals(Const.ENGINEERING_RUNNING)) {
            log.info("{}上片线，有正在执行的任务，结束本地上片请求", deviceId);
            return;
@@ -177,11 +181,12 @@
                .setSql("remain_quantity = remain_quantity - " + (finishCount + damageCount)));
        //更新工程下的原片数量 todo:sql待优化

        List<Integer> ids = upPattenUsageMapper.queryFinishByEngineering(deviceId, finishCount);
        upPattenUsageMapper.update(null, new LambdaUpdateWrapper<UpPattenUsage>()
                .in(UpPattenUsage::getId, ids)
                .set(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));

        if (finishCount > 0) {
            List<Integer> ids = upPattenUsageMapper.queryFinishByEngineering(deviceId, finishCount);
            upPattenUsageMapper.update(null, new LambdaUpdateWrapper<UpPattenUsage>()
                    .in(UpPattenUsage::getId, ids)
                    .set(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));
        }
        //todo:任务表数据情况
        task.setTaskRunning(0);
        task.setTotalCount(0);