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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -301,6 +301,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     @ApiParam(value ="故障字符串")
     private String faultStr;
 
+    @Transient
+    @ApiParam(value ="百分比")
+    private Integer propagation;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -1085,7 +1085,6 @@ public class ImppEnumUtil {
         WORK_WECHAT(8, "企业微信配置"),
         SMS(9, "短信配置"),
         SSO(10, "单点登录配置"),
-        PASSWORD_EXPIRE(11, "密码过期策略"),
         DINGTALK_REDIRECT(12, "钉钉授权跳转");
 
         private final int value;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java

@@ -31,6 +31,10 @@ public class MdmField extends BaseMdmBean {
     @ApiParam(value ="表名")
     private String tableName;
 
+    @Column(name="TABLE_DESCRIPTION")
+    @ApiParam(value ="表描述")
+    private String tableDescription;
+
     @Column(name="FIELD_NAME")
     @ApiParam(value ="字段名称")
     private String fieldName;
@@ -39,6 +43,14 @@ public class MdmField extends BaseMdmBean {
     @ApiParam(value ="字段描述")
     private String fieldDescription;
 
+    @Column(name="SERVICE_NAME")
+    @ApiParam(value ="服务名称")
+    private String serviceName;
+
+    @Column(name="SERVICE_CODE")
+    @ApiParam(value ="服务代码")
+    private String serviceCode;
+
     @Column(name="IS_SELECT")
     @ApiParam(value ="是否选中")
     private Integer isSelect;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :邮件配置
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2021-05-29 15:17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_MAIL")
+@ApiModel("邮件配置")
+public class MdmMail extends BaseMdmBean{
+    @Column(name = "MESSAGE_SENDER_NAME_RDD")
+    @ApiParam(value = "发送者名称")
+    private String messageSenderNameRdd;
+
+    @Column(name = "MESSAGE_RECEIVERS_NAME_RDD")
+    @ApiParam(value = "接受者名称")
+    private String messageReceiversNameRdd;
+
+    @Column(name = "IS_SEND")
+    @ApiParam(value = "是否发送")
+    private Integer isSend;
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java

@@ -8,10 +8,7 @@ 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;
-import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,6 +38,31 @@ public class MdmDataSubscribe extends BaseBean {
     @ApiParam("主数据名称")
     private String mdmName;
 
+
+    @Column(name = "MDM_SUBSCRIBE")
+    @ApiParam("订阅对象")
+    private String mdmSubscribe;
+
+    @Column(name = "MDM_SUBSCRIBE_TYPE")
+    @ApiParam("订阅类型")
+    private Integer mdmSubscribeType;
+
+    @Column(name = "MDM_SUBSCRIBE_PERMISSIONS")
+    @ApiParam("订阅权限")
+    private String mdmSubscribePermissions;
+
+    @Column(name = "MDM_SUBSCRIBE_FIELD")
+    @ApiParam("订阅字段")
+    @Lob
+    private String mdmSubscribeField;
+
+    @Transient
+    @ApiParam("订阅字段保存List")
+    private List<String> mdmSubscribeFields;
+
+
+
+
     @Column(name = "INTERNAL_APP_NUM")
     @ApiParam("内部订阅应用数量")
     private Integer internalAppNum;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java

@@ -31,21 +31,30 @@ public class MdmExternalApp extends BaseBean {
     private static final long serialVersionUID = -5344361274535836969L;
 
     @Column(name = "APP_NAME")
-    @ApiParam("应用名称")
+    @ApiParam("服务名称")
     private String appName;
 
     @Column(name = "APP_CODE")
-    @ApiParam("应用代码")
+    @ApiParam("服务代码")
     private String appCode;
 
     @Column(name = "CALL_TOKEN")
     @ApiParam("调用令牌")
     private String callToken;
 
+    @Column(name = "APP_BRIEF")
+    @ApiParam("服务简介")
+    private String appBrief;
+
     @Column(name = "CALLBACK_URL")
-    @ApiParam("回调地址")
+    @ApiParam("回调接口")
     private String callbackUrl;
 
+
+    @Column(name = "EMAIL")
+    @ApiParam("通知邮箱")
+    private String email;
+
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private String operateType;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java

@@ -89,9 +89,8 @@ public class MdmSyncDataThrough extends BaseMdmBean {
     }
 
     @ApiParam("同步数据id")
-    @Transient
     @AnnoOutputColumn(hidden = true)
-    private List<Long> syncDataId;
+    private String syncDataId;
 
     @ApiParam("同步数据用户名")
     private String syncDateUserName;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java

@@ -1,9 +1,14 @@
 package cn.estsh.i3plus.pojo.mdm.repository.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * @Description :
  * @Reference :
@@ -13,4 +18,5 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface MdmExternalAppRepository extends BaseRepository<MdmExternalApp, Long> {
+
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.base.MdmMail;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-15 16:26
+ * @Modify:
+ **/
+@Repository
+public interface MdmMailRepository extends BaseRepository<MdmMail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -87,6 +87,8 @@ public class MgnBjBoardModel implements Serializable {
 
     private Map<String, Object> resultMap;
 
+    private Object obj;
+
     @ApiParam("显示数据")
     private List<MgnBjBoardSeriesModel> seriesModels;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -58,4 +58,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam("关联单据行号")
     public String refItem;
+
+    @ApiParam("打印状态")
+    public Integer isPrinted;
 }

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

@@ -4,10 +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;
@@ -16,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
@@ -93,6 +91,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "库位信息")
     private WmsLocate wmsLocate;
 
+    @Transient
+    @ApiParam(value = "库位名称")
+    private String locateName;
+
+
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "可用数量")

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

@@ -4,14 +4,14 @@ 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.DynamicInsert;
 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;
 
 /**
@@ -117,4 +117,9 @@ public class BasImportTemplateDetails extends BaseBean{
     @Column(name="SHEET_NAME")
     @ApiParam("工作薄名称")
     private String sheetName;
+
+
+    @Column(name = "IS_EXPORT_TITLE")
+    @ApiParam("是否导出表头")
+    private Integer isExportTitle;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3218,9 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
-        if (details.getIsRequire() != null) {
+/*        if (details.getIsRequire() != null) {
             DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
-        }
+        }*/
         getStringBuilderPack(details, result);
         DdlPreparedPack.getOrderByPack(
                 new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},