中航打包PCR完成

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

@@ -86,5 +86,5 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("看板时段计划产量")
-    private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacities;
+    private List<MesBoardShiftSectionCap> boardShiftSectionCapacities;
 }

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

@@ -25,9 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY")
+@Table(name = "MES_BOARD_SHIFT_SECTION_CAP")
 @Api("MES_看板时段计划产量")
-public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable {
+public class MesBoardShiftSectionCap extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -1184108324734484237L;
 

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

@@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
@@ -54,7 +51,8 @@ public class MesDataAuth extends BaseBean implements Serializable {
     @ApiParam("数据对象名称")
     private String dataObjectName;
 
-    @Column(name = "FILTER_RULE", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "FILTER_RULE")
     @ApiParam("过滤规则")
     private String filterRule;
 

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

@@ -74,7 +74,7 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("离开调用")
     private Long outAmgId;
 
-    @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
+    @Column(name = "STATUS_TYPE")
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java

@@ -46,7 +46,7 @@ public class EngineScriptPersistenceHistory extends BaseBean {
 
     // 脚本的具体内容
     @Lob
-    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    @Column(name = "SCRIPT_CONTENT")
     private String scriptContent;
 
     // 脚本的描述，包含脚本的用法，参数说明等

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

@@ -64,7 +64,7 @@ public class BoardModel {
     private Integer periodCapacity = 0;
 
     @ApiParam("看板时段计划产量")
-    private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
+    private List<MesBoardShiftSectionCap> boardShiftSectionCapacityList;
 
     @ApiParam("看板设备状态")
     private List<MesBoardEquStatus> boardEquStatusList;

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

@@ -20,10 +20,6 @@ import javax.persistence.Transient;
  * @Modify:
  **/
 @Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
 @Api("组织模型")
 public class ProdOrgModel extends BaseBean {
 

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

@@ -189,6 +189,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("创建时间")
     private String createDatetime;
 
+    @ApiParam("创建时间")
+    private String packageNo;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.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.MesBoardShiftSectionCapacity;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCap;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface MesBoardShiftSectionCapacityRepository extends BaseRepository<MesBoardShiftSectionCapacity, Long> {
+public interface MesBoardShiftSectionCapRepository extends BaseRepository<MesBoardShiftSectionCap, Long> {
 }