From 34f27a5bfe5fbec3d8d69aa6e172802463272598 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Sat, 4 Jan 2020 14:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/bd/service/dto/ProductSeriesDTO.java  | 34 +++++++++++++++++++
 .../impl/QualityCheckSheetServiceImpl.java    |  3 ++
 2 files changed, 37 insertions(+)
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductSeriesDTO.java

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductSeriesDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductSeriesDTO.java
new file mode 100644
index 00000000..e449d0da
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/ProductSeriesDTO.java
@@ -0,0 +1,34 @@
+package me.zhengjie.modules.wms.bd.service.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+
+/**
+* @author huangxingxing
+* @date 2020-01-04
+*/
+@Data
+public class ProductSeriesDTO implements Serializable {
+
+    // 主键
+    // 处理精度丢失问题
+    @JsonSerialize(using= ToStringSerializer.class)
+    private Long id;
+
+    // 产品系列名称
+    private String productSeriesName;
+
+    // 状态
+    private Integer status;
+
+    // 创建时间
+    private Timestamp createTime;
+
+    // 更新时间
+    private Timestamp updateTime;
+}
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java
index fd320a4d..d475e625 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java
@@ -100,6 +100,9 @@ public class QualityCheckSheetServiceImpl implements QualityCheckSheetService {
                     Timestamp createTime = qualityCheckSheetDTO.getCreateTime();
                     qualityCheckSheetDTO.setCreateTimeStr(new SimpleDateFormat("yyyy-MM-dd").format(createTime));
 
+                    Timestamp updateTime = qualityCheckSheetDTO.getUpdateTime();
+                    qualityCheckSheetDTO.setUpdateTimeStr(new SimpleDateFormat("yyyy-MM-dd").format(updateTime));
+
                     // 查询对应的委外加工单的产品信息
                     List<QualityCheckSheetProduct> outSourceProcessSheetProductList = qualityCheckSheetProductRepository.queryByQualityCheckSheetIdAndStatusTrue(qualityCheckSheetDTO.getId());
                     if(!CollectionUtils.isEmpty(outSourceProcessSheetProductList)){