From bdf708b73a3866a8b88a590c2f0a38b302402e2f Mon Sep 17 00:00:00 2001
From: songss <songss>
Date: Mon, 7 Sep 2020 09:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesSnPhotoRelation.java   | 23 +++++++++++++++++++---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 15 ++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java
index d54028c..cdef2d5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java
@@ -31,9 +31,9 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3062206473345277360L;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("条码")
-   private String serialNumber;
-
+    @ApiParam("过程条码")
+    private String serialNumber;
+    //TODO 北京麦格纳使用，如要变更此字段需要更改对应业务代码
     @Column(name = "PHOTO_PATH")
     @ApiParam("照片路径")
     private String photoPath;
@@ -42,4 +42,21 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable {
     @ApiParam("照片名称")
     private String photoName;
 
+    @Column(name = "PHOTO_URL")
+    @ApiParam("照片访问地址")
+    private String photoUrl;
+
+    @Column(name = "PHOTO_ORIGINAL_PATH")
+    @ApiParam("照片原始路径")
+    private String photoOriginalPath;
+
+    @Column(name = "PHOTO_TRANSFER_PATH")
+    @ApiParam("照片转存路径")
+    private String photoTransferPath;
+
+    @Column(name = "PHOTO_TARGET_PATH")
+    @ApiParam("照片目标路径")
+    private String photoTargetPath;
+
+
 }
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 7638733..0333bea 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
@@ -3291,6 +3291,21 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) {
             DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean);
         }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoPath())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoPath(), "photoPath", packBean);
+        }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoUrl())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoUrl", packBean);
+        }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoOriginalPath())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoOriginalPath", packBean);
+        }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTransferPath())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTransferPath", packBean);
+        }
+        if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTargetPath())) {
+            DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTargetPath", packBean);
+        }
         return packBean;
     }