天津麦格纳-添加总装质量检测弹框工步和返工返修接口

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;

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;
+}

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;
+
+
 
 }