From 18ca368f3ca85b6eb364d2419dacae4e0c1cbe69 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 2 Sep 2020 09:29:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 333d936..9739b16 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/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; 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 4bc9fed..98004a8 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 @@ -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; + } }