From ad5c122df80d4263e1ff0f373f11e22073d14a27 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: Wed, 16 Sep 2020 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC=E7=BA=B3-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5=E5=92=8C=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java  |  4 ++
 .../pojo/mes/model/DismantleRecordModel.java       | 46 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/FutrueTaskModel.java     | 11 +++++-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index a22dd03..c809906 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("库位代码")
     private String locationCode;
 
+    @Column(name = "ERP_WORK_CENTER_CODE")
+    @ApiParam("erp工作中心")
+    private String erpWorkCenterCode;
+
     @Transient
     @ApiParam("目标库位代码")
     private String destLocationCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java
new file mode 100644
index 0000000..99913d8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DismantleRecordModel {
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("缺陷类型")
+    private String defectType;
+
+    @ApiParam("用户")
+    private String userInfo;
+
+    @ApiParam("物料拆解集合")
+    private List<MesDismantleRecord> dismantleRecordList;
+
+    @ApiParam("不良集合")
+    private List<MesDefect> defectList;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
index 77ab351..1fdcdda 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 条码解绑实体
  * @Reference:
@@ -12,7 +14,7 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class FutrueTaskModel {
+public class FutrueTaskModel<T> {
 
     @ApiParam("实现类")
     private Object futrueTaskService;
@@ -32,5 +34,12 @@ public class FutrueTaskModel {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("总装批量执行逻辑")
+    private List<T> requestBeanList;
+
+    @ApiParam("总装批量执行逻辑")
+    private Object specialBusinessType;
+
+
 
 }