From 30db0904a4577fd26c668152d8f572e44d83ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:08:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 74 +++++++++++++++++++ .../bean/AndonPLCRecord.java | 82 ++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java new file mode 100644 index 0000000..ae88bf0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.andon.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; + +/** + * @Description : ANDON_PLC控制 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLC extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java new file mode 100644 index 0000000..daf03f5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.andon.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; + +/** + * @Description : ANDON_PLC监控记录 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLCRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; + + @Column(name = "TAG_VALUE") + @ApiParam(value = "标签数值") + private String tagValue; + + @Column(name = "TAG_POINT") + @ApiParam(value = "传递方向") + private String tagPoint; +} From 5ef8089c02ff48646eec7cac25e9918e960ae0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:09:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java index daf03f5..4390a91 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("安灯PLC控制") +@Api("安灯PLC监控记录") public class AndonPLCRecord extends BaseBean { @Column(name = "WORK_CENTER_CODE") From 81821c70a8aad2c0a83acb16f8c2588b42061abe Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 May 2019 19:51:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index adbb369..2108003 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -170,6 +170,18 @@ public class WmsDocMovementDetails extends BaseBean { @Transient public Double inputMoveQty; + @Transient + @ApiParam(value ="标准包装",example = "1") + private Double snp; + + @Transient + @ApiParam(value ="条码总数量",example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value ="余数",example = "1") + private Double restQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; }