Merge remote-tracking branch 'origin/test' 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, "审核中"),
+        UNDER_REVIEW(10, "审核中"),
-        NOTICE_SMS(20, "审核通过"),
+        PASS(20, "审核通过"),
-        PROMOTE_SMS(30, "审核失败");
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -9586,6 +9586,43 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * TIME_STATUS
+     */
+    public enum TIME_STATUS {
+        NORMAL(1,"正常"),
+        TIME_OUT(2,"超时");
+
+        private int value;
+        private String description;
+
+        TIME_STATUS(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
 
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java

@@ -30,7 +30,7 @@ import java.io.Serializable;
 @Api("MES_看板图片")
 public class MesBoardImage extends BaseBean implements Serializable {
 
-    private static final long serialVersionUID = -3757764185082659130L;
+    private static final long serialVersionUID = -3511836584646450267L;
 
     @Column(name = "BOARD_CODE")
     @ApiParam("看板代码")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java

@@ -111,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Json4Es
     @Lob
     @Column(name = "LINE_DATA")

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;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -27,7 +26,7 @@ public class MesBoardWorkCenterOverviewModel {
     private String imageUrl;
 
     @ApiParam("工单列表")
-    List<MesWorkOrder> workOrderList;
+    List<ProductBiModel> workOrderList;
 
     @ApiParam("班组信息")
     MesShiftGroup shiftGroup;

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

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

@@ -24,7 +24,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
      */
 
     @ApiParam("工序")
-    private String processCode;
+    private List<String> processCodeList;
 
     //质量状态（20冻结，30报废）
     @ApiParam("质量状态")
@@ -40,7 +40,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
 
     //统计方式（0按月，1按天）
     @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    private Integer statisticalMethod;
 
     @ApiParam("开始时间")
     private String modifyStartDate;

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

@@ -41,12 +41,11 @@ public class ScrapOfPlatoModel {
     private BigDecimal scrapRatioPlato;
 
 
-    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
+    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
         this.partNo = partNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.defectCode = defectCode;
         this.defectName = defectName;
         this.numberOfDefects = numberOfDefects;
-        this.workCellCode = workCellCode;
     }
 }

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.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Version;
 
 /**
  * @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/SwebDocMovementMaster.java

@@ -1,18 +1,15 @@
 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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * @Description :
@@ -149,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean {
     @Column(name = "SHIP_TIME")
     @ApiParam(value = "发运时间")
     private String shipTime;
+
+    @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.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * @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;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -20,6 +22,7 @@ public class JisReportModel extends BaseBean {
     @ApiParam("实际发货数量")
     private Double actualShipingCount;
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description")
     private Integer shippingStatus;
     @ApiParam("料架号1")
     private String queueGroupNo_1;