照片采集完成

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;

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