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

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, "发送失败"),

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;
 

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 +
                 '}';
     }
 }

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;
+
+}

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);
+    }
+
     /**
      * 短信发送时间
      */

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

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;
 }

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;
 }