Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java

@@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable {
     private String defectLocation;
 
     @Transient
+    @ApiParam("颜色值")
+    private String colorValue;
+
+    @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
     public MesDefect() {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java

@@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable {
     @Column(name = "BUSINESS_TYPE_NAME")
     @ApiParam("业务类型名称")
     private String businessTypeName;
+
+    @Column(name = "COLOR_VALUE")
+    @ApiParam("颜色值")
+    private String colorValue;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.bean.template;
+package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
@@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
     @ApiParam("物料集")
     private String partAssemble;
 
+    @Column(name = "AREA_CODE")
+    @ApiParam("物料集")
+    private String areaCode;
+
+    @Column(name = "DEFECT_TYPE")
+    @ApiParam("缺陷类型")
+    private String defectType;
+
     @Transient
     @ApiParam("缺陷名称")
     private String defectCodeName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -294,6 +294,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("工位完成数量")
     private Integer stationCompleteQty = 0;
 
+    @Transient
+    @ApiParam("客户物料号")
+    private String customerPartNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java

@@ -70,4 +70,8 @@ public class ZzMesWorkOrderModel extends BaseBean {
     @AnnoOutputColumn(required = false)
     private String mouldCodeList;
 
+    @ApiParam("工作中心名称")
+    @AnnoOutputColumn(required = false)
+    private String workCenterName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import org.springframework.stereotype.Repository;
 
 /**

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import org.springframework.stereotype.Repository;
 /**
  * @Description:

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;