Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

4 years ago · 6f1257b3d2
parent c36e04056e 7ec47a5be2
commit 6f1257b3d2
8 changed files with 50 additions and 7 deletions
--- 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, "发送失败"),
--- 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", "开线检查，支持编辑"),
--- 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;
--- 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;
--- 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;
--- 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;
 }
--- 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);
+    }
+
    /**
     * 短信发送时间
     */
--- 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