From fb5df5aedf7e269b009b26da5a9f7fbcec77f98f Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 2 Nov 2020 20:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java      |  3 ++-
 .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 27b6637..95ed07f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -355,7 +355,8 @@ public class MesPcnEnumUtil {
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
         PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
+        SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 08e4739..a2de9c8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -729,6 +729,24 @@ public class MesHqlPack {
     }
 
     /**
+     * 产线看板矩阵
+     * @param boardLineMatrix
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode);
+        if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工步参数信息查询条件封装
      *
      * @param stepParam