From d226c27c2beef85b561f8d134032fa256b39132f Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Wed, 11 Nov 2020 20:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8E=A8=E9=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=99=84=E4=BB=B6=E7=9A=84=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=8A=9F=E8=83=BD=20=E5=A2=9E=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 15 ++++++++++-----
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java    |  4 +++-
 .../estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java |  7 ++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java
index f527605..8b34e26 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java
@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : 推送信息配置
@@ -60,10 +57,14 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SQL_STR", columnDefinition = "TEXT")
     private String sqlStr;
 
-    @ApiParam("脚本编号")
+    @ApiParam("数据获取脚本编号")
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
+    @ApiParam("附件文件路径获取脚本编号")
+    @Column(name = "ATTACH_SCRIPT_NO")
+    private String attachScriptNo;
+
     @Lob
     @ApiParam("标题模板")
     @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT")
@@ -94,4 +95,8 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "CONTENT_LABEL")
     private String contentLabel;
 
+    // 临时存储
+    @ApiParam("附件的文件路径")
+    @Transient
+    private String attachFilePath;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java
index e22e520..b8ef2ab 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java
@@ -48,5 +48,7 @@ public class WmsPushLog extends BaseBean{
     @ApiParam("推送地址")
     private String pathUrl;
 
-
+    @ApiParam("附件地址")
+    @Column(name = "ATTACH_FILE_PATH")
+    private String attachFilePath;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java
index 8c7abb5..26a77a4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java
@@ -1,12 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.util.List;
-import java.util.Map;
-
 @Data
 public class PushMessageModel {
 
@@ -29,5 +25,6 @@ public class PushMessageModel {
     @ApiParam("工厂代码")
     private String organizeCode;
 
-
+    @ApiParam("附件的文件路径")
+    private String attachFilePath;
 }