diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 9f449f4..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow == 0 ? 1 : startRow); + pager.setStartRow(startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 6ff8a9c..19f713f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FTP_CONNECTION_MODE { LOCAL_ACTIVE_MODE(10, "本地主动模式"), - LOCAL_PASSIVE_MODE(20, "本地被动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"); // REMOTE_ACTIVE_MODE(30, "远程主动模式"), - REMOTE_PASSIVE_MODE(40, "远程被动模式"); +// REMOTE_PASSIVE_MODE(40, "远程被动模式"); private final int value; private final String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java new file mode 100644 index 0000000..2d8aa20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_客户月度订单数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_CUST_ORDER_DATA") +@Api("IF_客户月度订单数据") +public class IfCustOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695346L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("订单数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Transient + @ApiParam("年度客户月度订单集合") + private List> ifCustOrderDataMap = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java new file mode 100644 index 0000000..fcf8e78 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes看板车间配置 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-11-09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_AREA") +@Api("mes看板车间配置") +public class MesBoardArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4592603687011665216L; + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("目标达成率") + private Double planPassYield; + + @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("上下偏差值") + private Double yieldDiffValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 129d45e..cfaf6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "IS_BI_DISPLAY") + @ApiParam("是否BI显示") + private Integer isBiDisplay = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index cce2193..8bcab46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,6 +53,9 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; + @ApiParam("颜色") + private String color; + @ApiParam("产线集合") private List workCenterList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java new file mode 100644 index 0000000..47b1a16 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfCustOrderDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java new file mode 100644 index 0000000..fd1a8de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardArea; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesBoardAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 394088d..75a8fea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; /** @@ -50,10 +51,11 @@ public class SysMessage extends BaseBean { if (this.messageType == null) { return 0; } else { - return this.messageType.intValue(); + return this.messageType; } } + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class) @Column(name = "MESSAGE_TYPE_CONTENT") @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; @@ -154,4 +156,16 @@ public class SysMessage extends BaseBean { @ApiParam(value = "附件集合") private List sysFileAttachList; + @Transient + @ApiParam(value = "附件id集合") + private List fileAttachIdList; + + public void addFileAttachId(Long attachId){ + if(fileAttachIdList == null){ + fileAttachIdList = new ArrayList<>(); + } + + fileAttachIdList.add(attachId); + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a472e9f..694c194 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -476,6 +476,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); + ddlPackBean.setOrderByStr(message.orderBy()); return ddlPackBean; } @@ -487,6 +488,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPreparedPack.getOrderDefault(file); DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index bce2e0d..1945d75 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -10,6 +10,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; @@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); } + @ColumnDefault("2") + @Column(name = "IS_CHECK_FILE") + @ApiParam(value = "是否校验文件") + private Integer isCheckFile; + + public boolean isCheckFile(){ + return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile); + } + + @Column(name = "CHECK_FILE_PATH") + @ApiParam(value = "校验文件路径") + private String checkFilePath; + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath;