From 63ddfd5a537a92b749c856efa1b2fcd5d1365151 Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Fri, 24 May 2019 11:48:40 +0800
Subject: [PATCH] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java        | 7 +++----
 .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
index d6ba7b6..b9a6c36 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,12 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.util.Date;
 
 /**
  * @Description :BOM清单
@@ -71,12 +70,12 @@ public class MesBom extends BaseBean {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effEndTime;
 
     public double getQtyVal() {
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 06b8339..a11e846 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
@@ -663,6 +663,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(packSpec.getSpecName())){
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
+        if (StringUtils.isNotEmpty(packSpec.getParentSpec())){
+            DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean);
+        }
 
         return packBean;
     }