From 6ffad99c5852ede230e329a2067f804bade11f8d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 10 Sep 2021 15:57:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bsp=20=E6=97=A5=E5=BF=97=E5=9B=9E=E8=B0=83p?= =?UTF-8?q?ojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsp/server/bean/model/HandleCallBackParam.java | 28 ++++++++++++ .../pojo/bsp/server/bean/model/RequestModel.java | 2 + .../i3plus/pojo/bsp/server/bean/po/MethodLog.java | 50 ++++++++++++++++++++++ .../bsp/server/bean/vo/DashboardSummaryVo.java | 39 +++++++++++++++++ .../bsp/server/repository/MethodLogRepository.java | 16 +++++++ 5 files changed, 135 insertions(+) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java new file mode 100644 index 0000000..d93afba --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:41 + * @Modify: + **/ +@Data +@ApiModel("方法回到") +public class HandleCallBackParam implements Serializable { + + private static final long serialVersionUID = 42L; + @ApiModelProperty(name = "日志ID") + private long logId; + @ApiModelProperty(name = "成功失败标志1成功，2失败") + private int handleCode; + @ApiModelProperty(name = "方法执行日志") + private String handleMsg; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java index 1d3d656..6366ff6 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java @@ -25,4 +25,6 @@ public class RequestModel { private String methodHandlerKey; @ApiModelProperty("方法的入参") private Map jsonParamMap; + @ApiModelProperty("日志id") + private Long logId; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java new file mode 100644 index 0000000..a5f3102 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.thoughtworks.xstream.converters.extended.NamedMapConverter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:01 + * @Modify: + **/ +@Table(name = "METHOD_LOG") +@Entity +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法调用日志") +public class MethodLog extends BaseBean implements Serializable { + + @ApiModelProperty("调用方法名冗余字段") + @Column(name = "METHOD_NAME_RDD") + private String methodNameRdd; + + @ApiModelProperty("方法id") + @Column(name = "METHOD_ID") + private Long methodId; + + @ApiModelProperty("方法参数") + @Column(name = "METHOD_PARAMS") + private String methodParam; + + @ApiModelProperty("方法调用日志信息") + @Column(name = "MESSAGE",columnDefinition = " text ") + private String message; + + @ApiModelProperty("方法是否执行成功") + @Column(name = "SUCCESS") + private Integer success; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java new file mode 100644 index 0000000..3758f60 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description :Dashboard 总方法数、总应用数、总实例数（总数，启用数，禁用数） + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 14:44 + * @Modify: + **/ +@ApiModel("Dashboard数据") +@Data +public class DashboardSummaryVo { + + @ApiModelProperty("总方法数") + private Integer totalMethodNum; + @ApiModelProperty("启用方法数") + private Integer enableMethodNum; + @ApiModelProperty("禁用方法数") + private Integer disableMethodNum; + + @ApiModelProperty("总应用数") + private Integer totalAppNum; + @ApiModelProperty("启用应用数") + private Integer enableAppNum; + @ApiModelProperty("禁用方法数") + private Integer disableAppNum; + + @ApiModelProperty("总实例数") + private Integer totalInstanceNum; + @ApiModelProperty("启动实例数") + private Integer enableInstanceNum; + @ApiModelProperty("禁用实例数") + private Integer disableInstanceNum; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java new file mode 100644 index 0000000..49f9732 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:13 + * @Modify: + **/ +@Repository +public interface MethodLogRepository extends BaseRepository { +} From f3190e6bbea29fb8fa4af1c230142d243c8a100c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 24 Sep 2021 18:37:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=86=B7=E7=83=AD?= =?UTF-8?q?=E5=88=86=E7=A6=BBpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/DataSeparatorMessage.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java new file mode 100644 index 0000000..fa93b3b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :冷热数据分离消息队列消息 + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/23 13:59 + * @Modify: + **/ +@Data +@Api(value = "冷热分离消息") +public class DataSeparatorMessage implements Serializable { + + private static final long serialVersionUID = -1; + + private Long id; + + private String refClass; + + +} From 49442ab5aa0a29bcce224ea40640f5b8923451aa Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 12 Oct 2021 13:27:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=90=E9=83=BD=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=EF=BC=8CwmsCqMaster=E6=96=B0=E5=A2=9E=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 9003e5f..a2a82f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean { this.partNameRdd = partNameRdd; this.createDatetime = createDatetime; } + + public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) { + this.orderNo = orderNo; + this.refSrc = refSrc; + this.remark = remark; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + this.partNo = partNo; + this.qty = qty; + this.orderStatus = orderStatus; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.createDatetime = createDatetime; + } } From e390e7fc334f8896d4545befea0fae9d8fb76181 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 17 Oct 2021 14:31:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=88=90=E9=83=BD=EF=BC=9APULL=5FWAY=5FSTA?= =?UTF-8?q?TUS=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E=20OVER=5FPULL(80,=20"?= =?UTF-8?q?=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3e95368..2fa95d8 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 @@ -4958,7 +4958,8 @@ public class WmsEnumUtil { PLANNED_PULL(40, "计划拉动"), ANDON_PULL(50, "安灯拉动"), EXTERNAL_PULL(60, "手工拉动"), - WORKORDER_PULL(70, "工单拉动"); + WORKORDER_PULL(70, "工单拉动"), + OVER_PULL(80, "过点拉动"); private int value; private String description; From 93f50a56be2f0eb6918587e5f0b9d02d0e2558c5 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 17 Oct 2021 14:58:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?WMS=5F=E4=BA=A7=E5=93=81=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=20=E6=96=B0=E5=A2=9E@ApiPa?= =?UTF-8?q?ram("=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95")=E5=AD=97=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/wms/bean/WmsDocFgDetail.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 7095697..fc9ff48 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "产品条码") private String serialNumber; + @Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2") + @ApiParam("是否已经生成领料单") + public Integer isGeneratePicking; From 77795be8df101f1deb9b3b29fced8bffb175c3df Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 23 Oct 2021 17:52:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?StationRequestBean=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 1 file changed, 4 insertions(+) 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 62bf9dd..d8a8973 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 @@ -214,6 +214,9 @@ public class StationRequestBean implements Serializable { @ApiParam("密码") private String password; + @ApiParam("缓存来源文件") + private String cacheSourceClass; + public StationRequestBean() { } @@ -252,6 +255,7 @@ public class StationRequestBean implements Serializable { ", finishCount=" + finishCount + ", packageNo=" + packageNo + ", createDatetime=" + createDatetime + + ", cacheSourceClass=" + cacheSourceClass + '}'; } }