diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index fec2dbd..2df2ad6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/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 boardShiftSectionCapacities; + private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java index 2b2e211..15d2172 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java @@ -27,7 +27,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY") @Api("MES_看板时段计划产量") -public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable { +public class MesBoardShiftSectionCap extends BaseBean implements Serializable { private static final long serialVersionUID = -1184108324734484237L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 72615c8..129386f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/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 boardShiftSectionCapacityList; + private List boardShiftSectionCapacityList; @ApiParam("看板设备状态") private List boardEquStatusList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index b668562..7078525 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -20,9 +20,6 @@ import javax.persistence.Transient; * @Modify: **/ @Data -@Entity -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") public class ProdOrgModel extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java similarity index 58% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java index 209e270..5c5c8ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java +++ b/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 { +public interface MesBoardShiftSectionCapRepository extends BaseRepository { }