From 4d5cdc710ed9f965a7aac789cd416c97943599f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 8 Jun 2021 09:33:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=9016023=2019081-=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=AE=89=E7=81=AF=E5=91=BC=E5=8F=AB=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94=E3=80=81=E5=91=BC=E5=8F=AB=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E5=92=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86-20210525=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 0e4b269..d3770f8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -298,6 +298,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { private Integer brokenTime; @Transient + @ApiParam(value ="响应时长(分钟)") + private Double sumDowntime; + + @Transient + @ApiParam(value ="故障时长(分钟)") + private Double sumBrokenTime; + + @Transient @ApiParam(value ="故障字符串") private String faultStr; From 778df56d2ecbed6963a05cbc6ae70829d9d34017 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 8 Jun 2021 11:11:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?16217=2020135--=E5=A2=9E=E5=8A=A0=E6=96=99?= =?UTF-8?q?=E6=9E=B6=E9=9C=80=E8=A6=81=E8=B7=9F=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB--2021-06-08=2016162=202013?= =?UTF-8?q?5--=E8=87=AA=E5=8A=A8=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E6=89=AB=E7=A0=81=EF=BC=88=E5=9C=A8=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D=E7=AC=AC=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=B7=A5=E5=8F=B7=EF=BC=8C=E6=AF=8F=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=80=E6=AC=A1=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=B7=A5=E5=8F=B7=EF=BC=89--2021-06-28=20161?= =?UTF-8?q?52=2020135--=E5=BC=82=E5=B8=B8=E9=94=81=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E9=94=81=E5=92=8C=E8=A7=A3=E9=94=81=E8=AE=B0=E5=BD=95?= =?UTF-8?q?--2021-06-25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 70ef63e..58af48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; /** * @Description : MES_容器 @@ -40,6 +36,10 @@ public class MesContainer extends BaseBean { @ApiParam(value = "容器类型代码") private String ctCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "产线代码") + private String workCenterCode; + @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index b463dcc..29b7d8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -77,4 +75,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "QR_CODE") @ApiParam("包装二维码") private String qrCode; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 4721ce4..60ff8fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -162,6 +160,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 44c290b..62bf9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -166,6 +166,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("按钮显示开关") + private Boolean buttonDisplay = true; + @ApiParam("是否按时完成") private Integer isOnTimeComplete = 1; From 470b05ebf00b0a441b282ac0519665b7f17c764e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 8 Jun 2021 16:20:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E4=BA=ACptl=E4=BA=AE=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/model/MgnBjAblePickModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java new file mode 100644 index 0000000..ed7aaad --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import lombok.Data; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.net.Socket; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/8 2:12 PM + * @Modify: + */ +@Data +public class MgnBjAblePickModel { + + private Socket socket = null; + + private String organizeCode; + private String areaNo; + private String clientInfo; + private String ip; + private Integer port; + + private Integer timeout = 3000; + private Integer sleepTime = 2000; + + private DataOutputStream bw; + private DataInputStream br; +}