hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -41,8 +41,8 @@ * 人工下片102 * 出片中103 * 调度中104 * 拿走200 * 破损201 * 破损8 * 拿走9 */ public static final Integer GLASS_STATE_NEW = 0; public static final Integer GLASS_STATE_IN = 100; @@ -50,8 +50,8 @@ public static final Integer GLASS_STATE_ARTIFICIAL = 102; public static final Integer GLASS_STATE_OUT_ING = 103; public static final Integer GLASS_STATE_SCHEDULE_ING = 104; public static final Integer GLASS_STATE_TAKE = 200; public static final Integer GLASS_STATE_DAMAGE = 201; public static final Integer GLASS_STATE_DAMAGE = 8; public static final Integer GLASS_STATE_TAKE = 9; public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104); public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104); @@ -98,29 +98,29 @@ * 2 卧转立进片完成 * 3 大车进片完成 * 4 大理片笼进片完成 * 5 大理片笼进片失败 * 6 大理片笼进片破损 * 8 大理片笼进片破损 * 9 大理片笼进片拿走 */ public static final Integer BIG_STORAGE_IN_NEW = 1; public static final Integer BIG_STORAGE_IN_UP = 2; public static final Integer BIG_STORAGE_IN_CAR = 3; public static final Integer BIG_STORAGE_IN_SLOT = 4; public static final Integer BIG_STORAGE_IN_ERROR = 5; public static final Integer BIG_STORAGE_IN_DAMAGE = 6; // public static final Integer BIG_STORAGE_IN_DAMAGE = 8; // public static final Integer BIG_STORAGE_IN_ERROR = 9; public static final List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2); /** * 卧转立出片请求 * 1 任务生成 * 2 玻璃进大车完成 * 3 大车出片完成 * 4 大理片笼进片失败 * 5 大理片笼进片破损 * 8 大理片笼进片破损 * 9 大理片笼进片拿走 */ public static final Integer BIG_STORAGE_OUT_NEW = 1; public static final Integer BIG_STORAGE_OUT_CAR = 2; public static final Integer BIG_STORAGE_OUT_SUCCESS = 3; public static final Integer BIG_STORAGE_OUT_ERROR = 4; public static final Integer BIG_STORAGE_OUT_DAMAGE = 5; // public static final Integer BIG_STORAGE_OUT_DAMAGE = 8; // public static final Integer BIG_STORAGE_OUT_ERROR = 9; public static final List<Integer> BIG_STORAGE_OUT_ALL = Arrays.asList(2, 3); /** @@ -139,8 +139,8 @@ * 2 进炉完成 * 3 钢化完成 * 4 出片完成 * 5 破损 * 6 拿走 * 8 破损 * 9 拿走 */ public static final Integer TEMPERING_NEW = -1; @@ -149,8 +149,8 @@ public static final Integer TEMPERING_START = 2; public static final Integer TEMPERING_SUCCESS = 3; public static final Integer TEMPERING_END = 4; public static final Integer TEMPERING_DAMAGE = 5; public static final Integer TEMPERING_TAKE = 6; // public static final Integer TEMPERING_DAMAGE = 8; // public static final Integer TEMPERING_TAKE = 9; /** * 下片 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -191,9 +191,9 @@ if (temperingGlassInfo != null) { if (status == 0) { temperingGlassInfo.setState(Const.TEMPERING_DAMAGE); temperingGlassInfo.setState(Const.GLASS_STATE_DAMAGE); } else { temperingGlassInfo.setState(Const.TEMPERING_TAKE); temperingGlassInfo.setState(Const.GLASS_STATE_TAKE); } temperingGlassInfoMapper.updateById(temperingGlassInfo); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -128,6 +128,8 @@ if (!REQUEST_WORD.equals(mesD01Value) && REQUEST_WORD.equals(d01ToMES) && (StringUtils.isBlank(d02State) || !REQUEST_WORD.equals(d03State))) { if (!d01GlassId.equals(d01Id)) { judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address); edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>() .set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d01Id)); d01GlassId = d01Id; } } @@ -135,6 +137,8 @@ if (!REQUEST_WORD.equals(mesD04Value) && REQUEST_WORD.equals(d04ToMES) && !REQUEST_WORD.equals(d05State)) { if (!d04GlassId.equals(d04Id)) { judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address); edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>() .set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d04Id)); d04GlassId = d04Id; } } @@ -476,10 +480,10 @@ log.info("大理片笼破损玻璃清除任务开始执行时间：{}", startDate); //获取进片任务表中状态为破损的数据 List<BigStorageCageFeedTask> inDamageTaskInfoList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>() .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE)); .eq(BigStorageCageFeedTask::getTaskState, Const.GLASS_STATE_DAMAGE)); if (CollectionUtils.isNotEmpty(inDamageTaskInfoList)) { log.info("获取进片任务表中破损的玻璃信息{}", inDamageTaskInfoList); bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE)); bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.GLASS_STATE_DAMAGE)); //理片笼详情表数据状态更新 bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList()))); @@ -501,10 +505,10 @@ } //获取出片任务表中状态为破损的数据 List<BigStorageCageOutTask> outDamageTaskInfoList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>() .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE)); .eq(BigStorageCageOutTask::getTaskState, Const.GLASS_STATE_DAMAGE)); if (CollectionUtils.isNotEmpty(outDamageTaskInfoList)) { log.info("获取出片任务表中破损的玻璃信息{}", outDamageTaskInfoList); bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE)); bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.GLASS_STATE_DAMAGE)); List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList()); //移除钢化下片表数据 temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));
