照片采集

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -4044,7 +4044,8 @@ public class MesEnumUtil {
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
-        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
+        PCN_IMAGE_NGINX(220, "PCN_IMAGE_NGINX", "PCN_IMAGE_NGINX");
 
         private int value;
         private String code;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3276,4 +3276,21 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * 条码照片关系
+     * @param snPhotoRelation
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesSnPhotoRelation(MesSnPhotoRelation snPhotoRelation, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(snPhotoRelation, organizeCode);
+        if (!StringUtils.isEmpty(snPhotoRelation.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean);
+        }
+        return packBean;
+    }
 }