From 5e43c3213172d7d76631ed3912125928a38dc8c3 Mon Sep 17 00:00:00 2001
From: "xiangming.liao@estsh.com" <xiangming.liao@estsh.com>
Date: Fri, 25 Dec 2020 17:28:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/model/MesPackageQueryModel.java       | 40 ++++++++++++++++
 .../model/MesProduceSnDisposableQueryModel.java    | 55 ++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java
new file mode 100644
index 0000000..38eaaa0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/18 16:13 下午
+ * @Description: 包装查询报表返回model
+ **/
+@Api("包装查询报表返回model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MesPackageQueryModel extends MesPackage {
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("产线")
+    private String workCenterName;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    public MesPackageQueryModel(String workCenterName, String workCellName) {
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java
new file mode 100644
index 0000000..a391502
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/23 13:38 下午
+ * @Description: 一次性通过率查询参数model
+ **/
+@Api("一次性通过率查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MesProduceSnDisposableQueryModel {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("统计方式")
+    private Integer statisticalPlacer;
+
+    @ApiParam("质量类型")
+    private String qcStatus;
+
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("账号/工号")
+    private String userLoginName;
+
+    @ApiParam("姓名")
+    private String userName;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
+}