From 6ffad99c5852ede230e329a2067f804bade11f8d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 10 Sep 2021 15:57:14 +0800 Subject: [PATCH 01/15] =?UTF-8?q?bsp=20=E6=97=A5=E5=BF=97=E5=9B=9E?= =?UTF-8?q?=E8=B0=83pojo?= 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 02/15] =?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 211d20e8408de1b84c4a850d3c90e5dafa06bdbb Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 21 Oct 2021 09:29:31 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index b5b3a86..c507260 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -986,7 +986,9 @@ public class CoreHqlPack { // hql拼接 DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); +// DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + //2021-10-19 修改成模糊查询 + DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean); DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean); @@ -1340,4 +1342,4 @@ public class CoreHqlPack { return ddlPackBean; } -} \ No newline at end of file +} From 0cfac0aaafc8f8bde7416d225eae4d21d106e997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Fri, 22 Oct 2021 17:49:11 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 6d92fb6..3992866 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; 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; @@ -41,6 +39,11 @@ import java.util.List; public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; @@ -440,8 +443,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer ngQty; - - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 05/15] =?UTF-8?q?StationRequestBean=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=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 + '}'; } } From 5666b5d1209be20436443a207bb1da75a51198f4 Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 26 Oct 2021 13:44:48 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8D=8E=E5=9F=9F=E7=9B=B8=E5=85=B3=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 505bebc..e7c518c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -128,7 +128,7 @@ public class BlockSoftSwitchEnumUtil { // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), - + CLIENT_WEB_SERVICE_HUAYU(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140005,"Client 华域的设置"), /* 数据源 */ CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), From 3270395d94595c69b9e12ed3f9e0d23777c7fcf4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Oct 2021 19:41:07 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=AE=89=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/FsmStatusModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java new file mode 100644 index 0000000..e34907a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/30 22:18 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FsmStatusModel { + + private String from; + + private String to; + + private String event; + + private Object context; + + private String status; + +} From 72673bfa121bbe0bf2afa400334b015a6710da5b Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 3 Nov 2021 17:33:59 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/SysRefUserRoleModel.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java new file mode 100644 index 0000000..a502375 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author ns + * @create 2021/11/3 0003 下午 17:31 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户角色关联model") +public class SysRefUserRoleModel implements Serializable { + private SysRefUserRole sysRefUserRole; + private SysUser sysUser; +} From 5b5e00eee7a277e40fd95bcee79b2932b7832139 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 4 Nov 2021 10:50:33 +0800 Subject: [PATCH 09/15] =?UTF-8?q?model=20core=20=E5=A2=9E=E5=8A=A0SysRoleM?= =?UTF-8?q?odel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/{SysRefUserRoleModel.java => SysRoleModel.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SysRefUserRoleModel.java => SysRoleModel.java} (68%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java similarity index 68% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java index a502375..1a033dd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; @@ -17,7 +19,7 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Api("用户角色关联model") -public class SysRefUserRoleModel implements Serializable { - private SysRefUserRole sysRefUserRole; - private SysUser sysUser; +public class SysRoleModel implements Serializable { + private SysRole sysRole; + private Pager pager; } From 7b9a91fd0f133de7191a356c5e90ae349a17f464 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 10 Nov 2021 11:04:43 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E3=80=9018541=2021062+=E7=9B=98=E7=82=B9?= =?UTF-8?q?=20=E7=9B=98=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E4=B8=80=E4=B8=AA=E6=89=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9C=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?+1110=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 9 insertions(+) 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 1552eba..367b73a7 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -124,6 +126,11 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("收货批次") public String lotNo = ""; + @Column(name = "package_no") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1a810a4..a391528 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1481,6 +1481,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSOrderDetails.getPackageNo(), "packageNo", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); @@ -1507,6 +1508,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSFactTrans.getPackageNo(), "packageNo", result); getStringBuilderPack(wmsCSFactTrans, result); From 0400305d9126e38f641fb9e8e95be312dc440a51 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 11 Nov 2021 13:32:20 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0aps-2=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9517965..ed94d5e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -64,6 +64,7 @@ public class CommonEnumUtil { * 计划排产服务 */ APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), + APS_2(18, 18400, 25, 141000000L, "i3aps-2", "高级计划与排产-2"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), /** From fc9ef265f91b2a29298a64996dab823ef9c1a1f9 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 11 Nov 2021 14:04:35 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9aps-2=E7=9A=84menurooti?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index ed94d5e..1ae7366 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -64,7 +64,7 @@ public class CommonEnumUtil { * 计划排产服务 */ APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), - APS_2(18, 18400, 25, 141000000L, "i3aps-2", "高级计划与排产-2"), + APS_2(18, 18400, 25, 180000000L, "i3aps-2", "高级计划与排产-2"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), /** From 5056f30f45ea385fe56e0c18e3ba9dc2d6e51301 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Mon, 15 Nov 2021 10:32:59 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85mes=E6=95=A3?= =?UTF-8?q?=E4=BB=B6=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AEBOM=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index d8fb95d..bbb096a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.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.*; import java.io.Serializable; /** @@ -41,6 +37,10 @@ public class MesScatterBomCfg extends BaseBean implements Serializable { @ApiParam("客户零件号") private String customerPartNo; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Column(name = "PART_LOCATION1") @ApiParam("产品位置1") private String partLocation1; From 4625987eefb249c5066b0522c012897153b77e1a Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Mon, 15 Nov 2021 17:35:31 +0800 Subject: [PATCH 14/15] =?UTF-8?q?Mes=E6=95=A3=E4=BB=B6BOM=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=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/mes/bean/MesScatterBomCfg.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index bbb096a..2d9edbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -92,4 +92,5 @@ public class MesScatterBomCfg extends BaseBean implements Serializable { @Column(name = "CHANGE_NO") @ApiParam("change No") private String changeNo; + } From cdd7f7bed22a3fa81d28ac199f895b4b4b721972 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Tue, 16 Nov 2021 09:25:03 +0800 Subject: [PATCH 15/15] =?UTF-8?q?WmsBH=E7=89=A9=E6=96=99=E5=AD=90=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E9=A1=B9=E6=96=B0=E5=A2=9E=E5=BD=95=E5=85=A5=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index c96e9a2..ab61c0d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -8,15 +8,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 : 物料子检测项 @@ -82,4 +78,8 @@ public class WmsPartItemCheck extends BaseBean { @ApiParam("最小值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; + + @Column(name = "INPUT_METHOD") + @ApiParam("录入方式") + private Integer inputMethod; }