From c880d51c9de7fbd0947d9526599f6037dbd1947c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 7 Feb 2021 00:18:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 8 ++++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) 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 278960b..6d817ab 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 @@ -2390,7 +2390,8 @@ public class WmsEnumUtil { QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"), INITIALIZE_SN("INITIALIZE_SN", "库存初始化"), - IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"); + IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"), + PRINT_PACKAGE_NO_SERIAN("PRINT_PACKAGE_NO_SERIAN", "包装编号序列化"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 478ebfd..1acf77d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.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; @@ -13,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -118,4 +118,8 @@ public class WmsBomTotal extends BaseBean { @Transient @ApiParam(value = "状态") private Integer status; + + @Transient + @ApiParam(value = "异常信息") + private String errorMsg; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c7f840e..75db91c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -556,6 +556,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("库位Z") private Integer z; + @Transient + @ApiParam("打印类型") + private Integer printType; + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { this.sn = sn; From e2a9222b479fc9754149189b651eefa068f7a40c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 19 Feb 2021 13:31:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?pcn=E7=99=BB=E9=99=86=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 4 +++ 2 files changed, 43 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 8e6f9f4..f175d1f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6585,4 +6585,43 @@ public class MesPcnEnumUtil { } } + /** + * 用户登陆状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_LOGIN_STATUS { + ONLINE(10, "在线"), + OFFLINE(20, "离线"); + + private int value; + private String description; + + USER_LOGIN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java index 2089bc7..b72573b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -71,4 +71,8 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable { @ApiParam(value ="模块" , access ="模块") private String moduleList; + @Column(name="STATUS") + @ApiParam(value ="状态" , access ="状态") + private Integer status; + } From b505fe84562b9766406b01a683a1969ac493160d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 19 Feb 2021 17:07:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?13858=2020027--=E6=8E=A5=E5=8F=A3=E8=A1=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=83=85=E5=86=B5=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/IfReportModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java new file mode 100644 index 0000000..b2cc171 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/19 2:58 PM + * @Modify: + */ +@Data +public class IfReportModel { + + @ApiParam("接口表代码") + private String ifTableCode; + + @ApiParam("接口表名称") + private String ifTableName; + + @ApiParam("总数") + private Integer total; + + @ApiParam("已同步数量") + private Integer alreadySync; + + @ApiParam("未同步数量") + private Integer noSync; + + @ApiParam("修改时间") + private String modifyDatetime; +} From fe6940b0dca8c44e36ef624e1e20cd634401b84d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 19 Feb 2021 19:33:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 17 +++++++++++++++-- .../estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 8c97553..9071712 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -54,13 +54,26 @@ public class MesNumberRule extends BaseBean implements Serializable { @Column(name = "SERIALNO_INCREMENT") @ApiParam("增量") - private Integer serialnoIncrement; + private Integer serialnoIncrement = 1; + + @Column(name = "BEGIN_VAL") + @ApiParam("起始值") + private Integer beginVal = 1; + + @Column(name = "END_VAL") + @ApiParam("最大值") + private Integer endVal; @Column(name = "IS_CYCLE") @ApiParam("最大值后循环") private Integer isCycle; + @Column(name = "IMPL_CLASS") + @ApiParam("最大值后不循环的实现类") + private String implClass; + @Column(name = "SPILT_RULE") - @ApiParam("拼接规则") + @ApiParam("拼接固定字符,多个逗号分隔") private String spiltRule; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 2d3b703..171102c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -106,6 +106,9 @@ public class GenSerialNoModel { @ApiParam("颜色名称") private String colorName; + @ApiParam("拼接动态字符,多个逗号分隔") + private String dynamicRule; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; From a98066dbe8abcdb8efe0030552339073471f9f36 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 22 Feb 2021 09:32:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index c5fccfa..825d8c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -195,4 +195,10 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Transient public Long sid; + + @Column(name = "SPLIT_SIGN") + @ApiParam("分割符号") + private String splitSign; + + }