From 4f5f9777a2003c0c8a76a86a8f1b7e6013a2e7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Sat, 9 May 2020 17:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E4=B8=8Emo?=
 =?UTF-8?q?del=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java  |  5 ++
 .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ----------------------
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 15 +++++-
 3 files changed, 19 insertions(+), 58 deletions(-)
 delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index 2f29e00..dcc8eed 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -82,4 +83,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Column(name = "CHECK_RESULT")
     @ApiParam("检测整体结果")
     private Integer checkResult;
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String supplierName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java
deleted file mode 100644
index d29da2c..0000000
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class QcDetailReportModel implements Serializable {
-    @ApiParam(value = "顾客名称")
-    private String customerName;
-
-    @ApiParam(value = "供应商名称")
-    private String supplierName;
-
-    @ApiParam(value = "供应商代码")
-    private String supplierCode;
-
-    @ApiParam(value = "送货时间")
-    private String deliveryDate;
-
-    @ApiParam(value = "物料号")
-    private String partNo;
-
-    @ApiParam(value = "物料描述")
-    private String partName;
-
-    @ApiParam(value = "生产日期")
-    private String productDate;
-
-    @ApiParam(value = "送货批次")
-    private String deliveryLotNo;
-
-    @ApiParam(value = "本批次生产总数")
-    private String lotNoProdQry;
-
-    @ApiParam(value = "供货数量")
-    private String supplyQty;
-
-    @ApiParam(value = "检测类型")
-    private Integer checkType;
-
-    @ApiParam(value = "检验项")
-    private String checkItem;
-
-    @ApiParam(value = "检验要求")
-    private String checkStandard;
-
-    @ApiParam(value = "检测值")
-    private String checkValue;
-
-    @ApiParam(value = "检测结果")
-    private Integer checkResult;
-
-    @ApiParam(value = "备注")
-    private String memo;
-}
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 4591186..de193d7 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,7 +5,6 @@ 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.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
@@ -964,6 +963,20 @@ public class MesHqlPack {
     }
 
     /**
+     * MES 检验单查询条件封装
+     *
+     * @param qcOrderDetail
+     * @return
+     */
+    public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES 物料信息查询条件封装
      *
      * @param part