From 96ea96f0a208ba02e6728895db6a5c32e403b78e Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Mon, 31 May 2021 14:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=98=8E=E7=BB=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?excel=20=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java  | 9 +++++++--
 .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
index 6657fad..21c1237 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -117,4 +117,9 @@ public class BasImportTemplateDetails extends BaseBean{
     @Column(name="SHEET_NAME")
     @ApiParam("工作薄名称")
     private String sheetName;
+
+
+    @Column(name = "IS_EXPORT_TITLE")
+    @ApiParam("是否导出表头")
+    private Integer isExportTitle;
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 3f8410e..571116c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -3218,9 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
-        if (details.getIsRequire() != null) {
+/*        if (details.getIsRequire() != null) {
             DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
-        }
+        }*/
         getStringBuilderPack(details, result);
         DdlPreparedPack.getOrderByPack(
                 new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},