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

@@ -7774,4 +7774,49 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_MENU_CODE {
+
+        STATION_MONITOR("STATION_MONITOR", "工位监控");
+
+        private String value;
+        private String description;
+
+        SRC_MENU_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_ALERT_CFG")
+@Api("MES_异常提醒配置")
+public class MesExceptionAlertCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895221L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "SRC_MENU_NAME")
+    @ApiParam("来源模块名称")
+    private String srcMenuName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "USER_CODE_GROUP")
+    @ApiParam("提醒人员集合")
+    private String userCodeGroup;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_WINDOW_RECORD")
+@Api("MES_弹窗异常提醒记录")
+public class MesExceptionWindowRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895345L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "USER_CODE")
+    @ApiParam("提醒人员")
+    private String userCode;
+
+    @Column(name = "MESSAGE_TYPE")
+    @ApiParam("消息类型")
+    private Integer messageType;
+
+    @Column(name = "MESSAGE_HEAD")
+    @ApiParam("提示表头")
+    private String messageHead;
+
+    @Column(name = "MESSAGE_CONTENT")
+    @ApiParam("提示内容")
+    private String messageContent;
+
+    @Column(name = "STATUS")
+    @ApiParam("处理状态")
+    private Integer status;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesExceptionAlertCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_异常提醒配置
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionAlertCfgRepository extends BaseRepository<MesExceptionAlertCfg, Long> {
+    
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesExceptionWindowRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_弹窗异常提醒记录
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionWindowRecordRepository extends BaseRepository<MesExceptionWindowRecord, Long> {
+    
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -3415,4 +3414,12 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) {
+        DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1232,4 +1232,23 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
+
+    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
+
+        DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
+
+        DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
@@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
+    public String getProcessStateTxt() {
+        return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
+                BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
+    }
+
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")
     private String processTime;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java

@@ -96,7 +96,7 @@ public class SwebPurchaseOrder extends BaseBean {
     private String refOrderNo;
 
     @Column(name = "EXPECTED_TIME")
-    @ApiParam(value = "预计到货时间")
+    @ApiParam(value = "预计交货时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String expectedTime;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -121,6 +121,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "供应商生产日期")
     private String venProductTime;
 
+    @Column(name = "EXPECTED_TIME")
+    @ApiParam(value = "预计交货时间")
+    private String expectedTime;
+
     @Transient
     @ApiParam(value = "合同号")
     private String refNo;

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

@@ -68,7 +68,7 @@ public class WmsActionModule extends BaseBean {
 
     @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2")
     @ApiParam(value = "是否脚本组件")
-    private Integer isScriptModule = FALSE;
+    private Integer isScriptModule;
 
     /**
      * 是否脚本组件

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

@@ -50,7 +50,8 @@ public class WmsTransportRule extends BaseBean {
     @Column(name = "BUSI_SCENE_TYPE")
     @ApiParam("业务场景")
     @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=BUSI_SCENE_TYPE_DICTIONARY", listColumnName = "name", explicitColumnName = "dictionaryValue")
     public Integer busiSceneType;