From 222ba4f8a4031f42a277e55d32cba4d2497fd82c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 17:49:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1825=20plc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4d2fc73..fc99205 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName; From 0bafa0de52861f4d9c99e9bdc3d604720913c215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 12 May 2020 18:13:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java index d8b72ec..fdcf3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -39,6 +39,10 @@ public class WmsThymeleaf extends BaseBean { @ApiParam("模板描述") private String tlDesc; + @Column(name = "PROMPT_MSG") + @ApiParam("引导消息") + private String promptMsg; + @Lob @Column(name = "TL_CONTENT", columnDefinition = "TEXT") @ApiParam(value = "模板内容") From de9c901a3b2b0bf5d652caf6a29fefee36730378 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 18:19:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1826=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 60 ++++++++++++++++++++++ .../repository/MesPartStockScheduleRepository.java | 15 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java new file mode 100644 index 0000000..2d24638 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -0,0 +1,60 @@ +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: + * @Author: jokelin + * @Date: 2020/5/12 5:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_STOCK_SCHEDULE") +@Api("MES_库存排程配置") +public class MesPartStockSchedule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8265586624645977526L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "MIN_CAPACITY") + @ApiParam("最小库存") + private Integer minCapacity; + + @Column(name = "TOTAL_CAPACITY") + @ApiParam("总容量") + private Integer totalCapacity; + + @Column(name = "STANDARD_CAPACITY") + @ApiParam("标准值") + private Integer standardCapacity; + + @Column(name = "SCHEDULE_CAPACITY") + @ApiParam("待生产箱数") + private Integer scheduleCapacity; + + @Column(name = "PLAN_QTY") + @ApiParam("产品JSP个数") + private Integer planQty; + + @Column(name = "TOTAL_PLAN_QTY") + @ApiParam("JSP总数") + private Integer totalPlanQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java new file mode 100644 index 0000000..fc15bd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartStockSchedule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:57 下午 + * @Modify: + */ +@Repository +public interface MesPartStockScheduleRepository extends BaseRepository { +}