Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -34,4 +35,22 @@ public class IfPartCheckCustomerLabel extends BaseBean {
     @Column(name = "IS_CHECK")
     @ApiParam("是否校验")
     private Integer isCheck;
+
+    @Column(name = "SYNC_STATUS")
+    @ColumnDefault("10")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -34,4 +35,22 @@ public class IfPartCheckCustomerLabelDetail extends BaseBean {
     @Column(name = "CUSTOMER_LABEL")
     @ApiParam("客户标签")
     private String customerLabel;
+
+    @Column(name = "SYNC_STATUS")
+    @ColumnDefault("10")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
 }

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

@@ -107,12 +107,24 @@ public class MesKpData extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("实采个数")
-    private Integer actualNum;
+    private Integer actualNum = 0;
 
     @Transient
     @ApiParam("记录颜色")
     private String color;
 
+    @Transient
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("采集结果")
+    private Integer result;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;

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

@@ -98,7 +98,16 @@ public class MesKpDataRecord extends BaseBean implements Serializable {
 
     @Column(name = "ACTUAL_NUM")
     @ApiParam("实采个数")
-    private Integer actualNum;;
+    private Integer actualNum;
+
+    @Column(name = "SPECIFIC_SN")
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;

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

@@ -154,6 +154,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("packmoth")
     private String packMoth;
 
+    @Column(name = "SERIAL_NO")
+    @ApiParam("零件流水号")
+    private String serialNo;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -50,7 +50,11 @@ public class MesShiftGroup extends BaseBean implements Serializable {
     @ApiParam("班长")
     private String squadLeader;
 
-    @Transient
-    @ApiParam("班组数")
-    private String count;
+    @Column(name = "USER_EMP_NO")
+    @ApiParam(value = "工号")
+    private String userEmpNo;
+
+    @Column(name = "SHIFT_NUM")
+    @ApiParam("班组人数")
+    private String shiftNum;
 }

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

@@ -3493,10 +3493,13 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean);
         }
         if (!StringUtils.isEmpty(controlPlan.getVersion())) {
-            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean);
+            DdlPreparedPack.getNumEqualPack(controlPlan.getVersion(), "version", packBean);
         }
         if (!StringUtils.isEmpty(controlPlan.getAuditType())) {
-            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean);
+            DdlPreparedPack.getNumEqualPack(controlPlan.getAuditType(), "auditType", packBean);
+        }
+        if (!StringUtils.isEmpty(controlPlan.getIsEnable())) {
+            DdlPreparedPack.getNumEqualPack(controlPlan.getIsEnable(), "isEnable", packBean);
         }
         return packBean;
     }