From cb9add43a33b84b5d50372eea8534b0f8209831c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 7 Jan 2021 15:52:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(sms):=E7=9F=AD=E4=BF=A1=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=9E=9A=E4=B8=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 10 +++++++--- .../i3plus/pojo/platform/bean/SysSmsSendRecord.java | 9 +++++++++ .../i3plus/pojo/platform/bean/SysSmsTemplate.java | 19 ++++++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 017b3c5..1892d1e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1476,6 +1476,7 @@ public class ImppEnumUtil { /** * 短信供应商 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SUPPLIER { ALI_CLOUD(1, "阿里云"); @@ -1523,10 +1524,11 @@ public class ImppEnumUtil { /** * 短信模板状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_STATUS { - VER_CODE(10, "审核中"), - NOTICE_SMS(20, "审核通过"), - PROMOTE_SMS(30, "审核失败"); + UNDER_REVIEW(10, "审核中"), + PASS(20, "审核通过"), + FAIL(30, "审核失败"); private int value; private String description; @@ -1561,6 +1563,7 @@ public class ImppEnumUtil { /** * 短信模板类型 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_TYPE { VER_CODE(10, "验证码"), NOTICE_SMS(20, "短信通知"), @@ -1600,6 +1603,7 @@ public class ImppEnumUtil { /** * 短信发送状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SEND_STATUS { WAIT_RECEIPT(10, "等待回执"), FAIL(20, "发送失败"), diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java index 64f297f..19bbe3f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -47,6 +48,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "软件模块") private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + /** * 接收手机号 */ @@ -104,6 +109,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "短信发送状态") private Integer smsSendStatus; + public String getSmsSendStatusTxt() { + return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus); + } + /** * 短信发送时间 */ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java index c298f3e..40bf0f3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -51,12 +51,13 @@ public class SysSmsTemplate extends BaseBean { * 模板代码 */ @Column(name = "SUPPLIER_TEMPLATE_CODE") - @ApiModelProperty(value = "模板代码") + @ApiModelProperty(value = "供应商模板代码") private String supplierTemplateCode; /** * 模板类型 */ + @AnnoOutputColumn @Column(name = "TEMPLATE_TYPE") @ApiModelProperty(value = "模板类型") private Integer templateType; @@ -64,10 +65,15 @@ public class SysSmsTemplate extends BaseBean { /** * 供应商类型 */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class) @Column(name = "SUPPLIER_TYPE") @ApiModelProperty(value = "供应商类型") private Integer supplierType; + public String getSupplierTypeTxt() { + return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType); + } + /** * 模板状态 */ @@ -76,6 +82,10 @@ public class SysSmsTemplate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) private Integer templateStatus; + public String getTemplateStatusTxt() { + return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus); + } + /** * 模板内容 */ @@ -92,6 +102,13 @@ public class SysSmsTemplate extends BaseBean { /** + * 是否修改模板内容 + */ + @Transient + @ApiModelProperty(value = "是否修改模板内容") + private Integer isModifyContent; + + /** * 审批备注 */ @Transient From 63fc619c749cf2f0aff41ed25724fbbab3c364b4 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 7 Jan 2021 16:20:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java | 11 +++++------ .../cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 11 ++++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index ce0f43a..e1de11e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -5,17 +5,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @Description : @@ -167,4 +162,8 @@ public class SwebDocMovementDetails extends BaseBean { @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 30a319d..c7e256f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -1,19 +1,16 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -81,4 +78,8 @@ public class SwebDocMovementSn extends BaseBean { @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") private String vendorName; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } From 45a7ff613240a2499981f67ba4361297e70f337c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 7 Jan 2021 16:37:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesPaintSnPrintModel.java | 4 +++ .../i3plus/pojo/mes/model/StationRequestBean.java | 4 ++- .../mes/model/mgn/tj/AssemblyRealWorkModel.java | 30 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java index 45ed828..c92b82b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,6 +30,9 @@ public class MesPaintSnPrintModel implements Serializable { @ApiParam("包装编号") private String packageNo; + @ApiParam("包装信息") + private MesPackage packageInfo; + @ApiParam("工单号") private String workOrderNo; 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 846880d..30814e3 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 @@ -190,7 +190,7 @@ public class StationRequestBean implements Serializable { @ApiParam("创建时间") private String createDatetime; - @ApiParam("创建时间") + @ApiParam("包装编号") private String packageNo; @ApiParam("密码") @@ -232,6 +232,8 @@ public class StationRequestBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", tray='" + tray + '\'' + ", finishCount=" + finishCount + + ", packageNo=" + packageNo + + ", createDatetime=" + createDatetime + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java new file mode 100644 index 0000000..ebb9bc8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 总装实际产量model + * @Author: wangjie + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class AssemblyRealWorkModel { + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("实际产量") + private Double realProdQty; + + @ApiParam("实际目标") + private Double realPlanQty; + + @ApiParam("班产目标") + private Double shiftPlanQty; + + @ApiParam("本班达成率") + private Integer shiftPassPercent; + +}