Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -64,4 +64,8 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable {
     @Column(name = "FIELD_DESC")
     @ApiParam("扩展字段描述")
     private String fieldDesc;
+
+    @Column(name = "ORIGINAL_FIELD_CODE")
+    @ApiParam("原始字段代码")
+    private String originalFieldCode;
 }

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

@@ -192,7 +192,7 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("节拍时间")
-    private Integer cycleTime;
+    private Integer cycleTime = 0;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Dominic
+ * @CreateDate: 2019\11\28 19:50
+ * @Modify:
+ **/
+@Data
+public class CosmaDefectModel {
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("类型")
+    private String type;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("缺陷代码集合")
+    private List<String> defectCodeList;
+
+    @ApiParam("缺陷位置")
+    private String location;
+
+    @ApiParam("操作人")
+    private String userName;
+
+    @ApiParam("报废原因")
+    private String scrapCode;
+}