diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 566aa9c..cb53973 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -53,4 +53,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("顺序") private Integer seq; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index fa677a8..9a7debb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -379,7 +379,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer endCheckQty; @Transient - @ApiParam("终检数量") + @ApiParam("打包数量") private Integer finalInspectionQty; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java new file mode 100644 index 0000000..837b718 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class AssembleDefectModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("抛光层级model") + private AssembleDefectModel polishingModel; + + @ApiParam("拆解层级model") + private AssembleDefectModel disassembleModel; + + @ApiParam("不良类型集合") + private List defectModelList; + + @ApiParam("类型代码") + private String typeCode; + + @ApiParam("类型名称") + private String typeName; + + @ApiParam("不良集合") + private List 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 f1114df..4e8de2f 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 @@ -1,16 +1,14 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; /** - * @Description: 条码解绑实体 + * @Description: 异步任务model * @Reference: - * @Author: siliter.yuan + * @Author: wangjie * @CreateDate: 2020-06-28-11:44 * @Modify: **/ @@ -20,15 +18,6 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("工位请求bean") - private StationRequestBean stationRequestBean; - - @ApiParam("产品条码表") - private MesProduceSn produceSn; - - @ApiParam("产品绑定记录表") - private MesProdBindRecord prodBindRecord; - @ApiParam("组织代码") private String organizeCode; @@ -38,12 +27,10 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; - @ApiParam("总装批量执行逻辑") - private List requestBeanList; - - @ApiParam("总装批量执行逻辑") - private Object specialBusinessType; - + @ApiParam("数据") + private Object Obj; + @ApiParam("集合") + private List list; }