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

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/MesPackageQueryModel.java

@@ -26,6 +26,9 @@ public class MesPackageQueryModel extends MesPackage {
     @ApiParam("工作单元名称")
     private String workCellName;
 
+    @ApiParam("是否封箱Name")
+    private String isSealedName;
+
     public MesPackageQueryModel(String workCenterName, String workCellName) {
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
@@ -37,4 +40,13 @@ public class MesPackageQueryModel extends MesPackage {
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
     }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.isSealedName=isSealedName;
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品条码返回model
+ * @author xiangming.liao
+ * @version 1.0
+ * @date 2021/01/06 10:43
+ **/
+@Data
+@ApiModel("产品条码返回model")
+public class CosmaReportProductSnModel extends MesProduceSn implements Serializable {
+
+    private static final long serialVersionUID = 5217363746963291483L;
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java

@@ -21,18 +21,37 @@ import java.util.List;
 public class ProduceDispPassPlatoModel {
 
     @ApiParam("项目号")
-    private List<String> prodCfgTypeCodeList;
+    private String prodCfgTypeCode;
 
     @ApiParam("零件号")
-    private List<String> partNoList;
+    private String partNo;
 
-    @ApiParam("单项占比")
-    private BigDecimal singleRatio;
+    @ApiParam("缺陷代码")
+    private String defectCode;
 
-    @ApiParam("累计占比")
-    private BigDecimal cumulativeRatio;
+    @ApiParam("缺陷名称")
+    private String defectName;
 
-    @ApiParam("缺陷数量")
-    private BigDecimal defectQty;
+    @ApiParam("单项占比")
+    private Double singleRatio;
 
+    @ApiParam("累计占比")
+    private Double cumulativeRatio;
+
+    @ApiParam("数量")
+    private Long qty;
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.qty = qty;
+    }
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.qty = qty;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model.report;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -17,16 +18,17 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoQueryModel {
+public class ProduceDispPassPlatoQueryModel extends BaseBean {
     /**
      * 必选
      */
 
     @ApiParam("工序")
-    private String processCode;
+    private List<String> processCodeList;
 
-    @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    //质量状态（20冻结，30报废）
+    @ApiParam("质量状态")
+    private List<Integer> qcStatusList;
     /**
      * 可选
      */
@@ -36,6 +38,10 @@ public class ProduceDispPassPlatoQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
+    //统计方式（0按月，1按天）
+    @ApiParam("统计方式")
+    private Integer statisticalMethod;
+
     @ApiParam("开始时间")
     private String modifyStartDate;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java

@@ -19,11 +19,9 @@ public class ProduceDispPassRateModel {
     @ApiParam("统计时间")
     private String statisticalTime;
 
-    @ApiParam("质量状态/类型")
-    private Integer qcStatus;
-
+    //统计选项（10=全部，20=冻结，30=报废）
     @ApiParam("统计选项")
-    private String statisticalOption;
+    private Integer statisticalOption;
 
     @ApiParam("冻结数")
     private BigDecimal freezeQty;
@@ -37,9 +35,8 @@ public class ProduceDispPassRateModel {
     @ApiParam("占比率")
     private BigDecimal ratio;
 
-    public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+    public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
         this.statisticalTime = statisticalTime;
-        this.qcStatus = qcStatus;
         this.statisticalOption = statisticalOption;
         this.freezeQty = freezeQty;
         this.scrapQty = scrapQty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java

@@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("工序")
     private String processCode;
 
+    //统计方式（0=按月，1按天）
     @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    private Integer statisticalMethod;
 
+    //质量状态（10=合格，20=冻结，30=报废）
     @ApiParam("质量类型")
-    private String qcStatus;
+    private Integer qcStatus;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
 
     /**
      * 可选
@@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    @ApiParam("开始时间")
-    private String modifyStartDate;
-
-    @ApiParam("结束时间")
-    private String modifyEndDate;
 
 }

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