diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 58ebed3..cdd8873 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4035,7 +4035,7 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘盈"), INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java new file mode 100644 index 0000000..22508ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java @@ -0,0 +1,44 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REAL_TIME_TAKT") +@Api("MES_实时节拍") +public class MesRealTimeTakt extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2910474711746286558L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "REAL_TIME_TAKT") + @ApiParam("实时节拍") + private String realTimeTakt; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java new file mode 100644 index 0000000..765082d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.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.MesRealTimeTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Repository +public interface MesRealTimeTaktRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 68abad8..85b257d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -148,7 +152,7 @@ public class WmsCSOrderDetails extends BaseBean { public String[] zoneNos; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异类型") @@ -156,7 +160,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer differenceType; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异集合") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java new file mode 100644 index 0000000..c77e082 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP COGI快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_COGI_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpCOGISnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095222692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + private String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java new file mode 100644 index 0000000..9171ffb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description : ERP 数据快照时间 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_CHECK_POINT") +public class WmsErpCheckPoint extends BaseBean { + + private static final long serialVersionUID = 5589607687871639189L; + + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''", nullable=false) + @ApiParam("快照时间") + public String snapshotTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java new file mode 100644 index 0000000..bb1812d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 报文接口快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_INTERFACE_SNAPSHOT", indexes = { + @Index(columnList = "SID"), + @Index(columnList = "SENDER"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "RECEIVER"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpInterfaceSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095333692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "SID") + @ApiParam("业务唯一编号") + public String sid; + + @Column(name = "SENDER") + @ApiParam("发送方") + public String sender; + + @Column(name = "SEND_TIME") + @ApiParam("发出时间") + public String sendTime; + + @Column(name = "RECEIVER") + @ApiParam("接收方") + public String receiver; + + @Column(name = "RECEIVED_TIME") + @ApiParam("接收时间") + public String receivedTime; + + @Column(name = "TRANS_TIME") + @ApiParam("处理时间") + public String transTime; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public String transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java new file mode 100644 index 0000000..ac326b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 库存结余快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_STOCK_QUAN_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpStockQuanSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java new file mode 100644 index 0000000..e0a51d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 交易快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_TRANS_SNAPSHOT", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpTransSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095555692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单据编号") + private String orderNo; + + @Column(name = "YEAR") + @ApiParam("凭证年度") + private String year; + + @Column(name = "ITEM") + @ApiParam("行项目") + private String item; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name = "CUSTOMER_NO") + @ApiParam("客户编号") + private String customerNo; + + @Column(name = "AMOUNT") + @ApiParam("金额") + private Double amount; + + @Column(name = "DR_AND_CR") + @ApiParam("借贷标识：H=贷方- S=借方+") + private String drandcr; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index 694ebfc..d565516 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -56,9 +56,9 @@ public class WmsQCStatusModel { private Double proportion; @ApiParam("标准质检时间") - private Integer stdCheckTime; + private Double stdCheckTime; - public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) { + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { this.asnOrderNo = asnOrderNo; this.qcOrderNo = qcOrderNo; this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java new file mode 100644 index 0000000..114da9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCOGISnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCOGIRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java new file mode 100644 index 0000000..2a767bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpStockQuanRepository extends BaseRepository { +}