Merge remote-tracking branch 'origin/ext-dev' into ext-dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -6585,4 +6585,43 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 用户登陆状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_LOGIN_STATUS {
+        ONLINE(10, "在线"),
+        OFFLINE(20, "离线");
+
+        private int value;
+        private String description;
+
+        USER_LOGIN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2390,7 +2390,8 @@ public class WmsEnumUtil {
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
         INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
-        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
+        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"),
+        PRINT_PACKAGE_NO_SERIAN("PRINT_PACKAGE_NO_SERIAN", "包装编号序列化");
 
         private String code;
         private String description;

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

@@ -54,13 +54,26 @@ public class MesNumberRule extends BaseBean implements Serializable {
 
     @Column(name = "SERIALNO_INCREMENT")
     @ApiParam("增量")
-    private Integer serialnoIncrement;
+    private Integer serialnoIncrement = 1;
+
+    @Column(name = "BEGIN_VAL")
+    @ApiParam("起始值")
+    private Integer beginVal = 1;
+
+    @Column(name = "END_VAL")
+    @ApiParam("最大值")
+    private Integer endVal;
 
     @Column(name = "IS_CYCLE")
     @ApiParam("最大值后循环")
     private Integer isCycle;
 
+    @Column(name = "IMPL_CLASS")
+    @ApiParam("最大值后不循环的实现类")
+    private String implClass;
+
     @Column(name = "SPILT_RULE")
-    @ApiParam("拼接规则")
+    @ApiParam("拼接固定字符,多个逗号分隔")
     private String spiltRule;
+
 }

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

@@ -71,4 +71,8 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable {
     @ApiParam(value ="模块" , access ="模块")
     private String moduleList;
 
+    @Column(name="STATUS")
+    @ApiParam(value ="状态" , access ="状态")
+    private Integer status;
+
 }

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

@@ -106,6 +106,9 @@ public class GenSerialNoModel {
     @ApiParam("颜色名称")
     private String colorName;
 
+    @ApiParam("拼接动态字符,多个逗号分隔")
+    private String dynamicRule;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/2/19 2:58 PM
+ * @Modify:
+ */
+@Data
+public class IfReportModel {
+
+    @ApiParam("接口表代码")
+    private String ifTableCode;
+
+    @ApiParam("接口表名称")
+    private String ifTableName;
+
+    @ApiParam("总数")
+    private Integer total;
+
+    @ApiParam("已同步数量")
+    private Integer alreadySync;
+
+    @ApiParam("未同步数量")
+    private Integer noSync;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java

@@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 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;
@@ -13,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -118,4 +118,8 @@ public class WmsBomTotal extends BaseBean {
     @Transient
     @ApiParam(value = "状态")
     private Integer status;
+
+    @Transient
+    @ApiParam(value = "异常信息")
+    private String errorMsg;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -566,6 +566,9 @@ public class WmsStockSn extends BaseBean {
     @Transient
     @ApiParam("泊位")
     private String zdoc;
+    
+    @ApiParam("打印类型")
+    private Integer printType;
 
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -195,4 +195,10 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Transient
     public Long sid;
+
+    @Column(name = "SPLIT_SIGN")
+    @ApiParam("分割符号")
+    private String splitSign;
+
+
 }