From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期日, 20 十月 2024 21:06:51 +0800 Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase,仅需要有脚本变动的时候开启在执行,避免启动报错 3、原片仓储新增入库请求、出库情况,调整整体逻辑,增加格子号架子号,任务表、详情表、工位表都需要记录架子信息,用于任务执行过程中,架子在执行过程中可返回架子对应的工位上,避免架子乱放后格子架子号不对应的情况发生。 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java index ccd0419..2a9f2a9 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java @@ -189,6 +189,8 @@ public static final Integer RAW_GLASS_TASK_TYPE_IN = 1; public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2; public static final Integer RAW_GLASS_TASK_TYPE_DISPATCH = 3; + public static final Integer RAW_GLASS_TASK_TYPE_IN_REQUEST = 4; + public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5; /** * 鍘熺墖浠撳偍浠诲姟绫诲瀷 @@ -211,6 +213,16 @@ public static final Integer RAW_GLASS_STATE_WAIT_OUT = 102; public static final Integer RAW_GLASS_STATE_RUNNING = 103; public static final Integer RAW_GLASS_STATE_CAR = 104; + public static final List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103); + + public static final Integer RAW_GLASS_TASK_NEW = 0; + public static final Integer RAW_GLASS_TASK_SUCCESS = 1; + public static final Integer RAW_GLASS_TASK_FAILURE = 2; + + /** + * 璁惧鍙� + */ + public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3); } -- Gitblit v1.8.0