From a0780669c335431579e39eab5f657cfe509ab0ee Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Thu, 5 Dec 2019 15:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1287?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java |  4 ++--
 .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
index 5ebbca0..bd45841 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
@@ -42,6 +42,6 @@ public class MesProduceCtgyPicture extends BaseBean {
     private Long fileId;
 
     @Transient
-    @ApiParam("文件名称")
-    private String fileName;
+    @ApiParam("文件原名称")
+    private String fileOriginName;
 }
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 6f6a532..368abef 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
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import org.springframework.util.StringUtils;
 
@@ -1848,14 +1849,20 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+//            DdlPreparedPack.timeBuilder(
+//                    mesProduceSn.getOutWorkCenterStartTime(),
+//                    mesProduceSn.getOutWorkCenterEndTime(),
+//                    "outWorkCenterTime", packBean, true);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSn.getCreateDateTimeStart(),
                 mesProduceSn.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getOutWorkCenterStartTime(),
-                mesProduceSn.getOutWorkCenterEndTime(),
-                "outWorkCenterTime", packBean, true);
         return packBean;
     }