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/4] =?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 10ae50395265c7c70b523a78f14f9870748df05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 7 Jan 2021 19:35:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 4 ++++ 2 files changed, 10 insertions(+) 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 03b6571..2d3b703 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 @@ -100,6 +100,12 @@ public class GenSerialNoModel { @ApiParam("版本号") private String versionNo; + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 82dfdf8..c7e4c70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -141,4 +141,8 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("版本号") private String versionNo; + @ApiParam("泰国WL物料描述") + private String tgPartDesc; + @ApiParam("泰国过程条码截取前11位") + private String snTop11; } From 7d8fd1537070cbc269fbfd22fdf103fd503b3fd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 Jan 2021 09:33:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 49b6317..ae350ac 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 @@ -872,7 +872,8 @@ public class WmsEnumUtil { COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR - PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"), + SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR private int value; private String code; From 7f6281f63e24ab709a7443736c8386c24cc2f592 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 8 Jan 2021 17:38:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=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/MesEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index d42b6e7..12e6d71 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2056,7 +2056,7 @@ public class MesEnumUtil { MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"), MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 4b09f12..797fa82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -172,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; this.packageNo = packageNo; this.qty = qty; this.createDatetime = createDatetime;