Merge remote-tracking branch 'remotes/origin/test'

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

@@ -209,8 +209,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1, "通用"),EXCEPTION(2, "异常"),
-        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"),
+        COMMON(1, "通用"),
+        EXCEPTION(2, "异常"),
+        MODULE(10, "模块"),
+        METHOD(11, "功能"),
+        BUTTON(12, "按钮"),
         WEB(13, "前端");
 
         private int value;

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

@@ -1022,7 +1022,8 @@ public class ImppEnumUtil {
         PASSWORD(2, "密码安全策略"),
         MAIL(3, "邮件配置"),
         CONTACT(4, "联系人"),
-        BASIS(5, "基础");
+        BASIS(5, "基础"),
+        CONFIG(6, "系统配置");
 
         private int value;
         private String description;

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

@@ -9,12 +9,13 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 打印模板
  * @Reference :
- * @Author : siliter
- * @CreateDate : 2019-03-18 11:00
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
  * @Modify:
  **/
 @Data
@@ -22,7 +23,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="Mes_LABEL_TEMPLATE")
+@Table(name="MES_LABEL_TEMPLATE")
 @Api(value="打印模板",description = "打印模板")
 public class MesLabelTemplate extends BaseBean {
 
@@ -44,4 +45,8 @@ public class MesLabelTemplate extends BaseBean {
     @ApiParam(value ="模板参数拼接")
     @Transient
     private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<MesLabelTemplateParam> labelTemplateParamList;
 }

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

@@ -15,8 +15,8 @@ import javax.persistence.*;
 /**
  * @Description : 打印模板参数
  * @Reference :
- * @Author : siliter
- * @CreateDate : 2019-03-18 11:00
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
  * @Modify:
  **/
 @Data
@@ -24,7 +24,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="Mes_LABEL_TEMPLATE_PARAM")
+@Table(name="MES_LABEL_TEMPLATE_PARAM")
 @Api(value="打印模板参数",description = "打印模板参数")
 public class MesLabelTemplateParam extends BaseBean {
 

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

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes-pcn定时任务工作清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_TASK")
+@Api("mes-pcn定时任务工作清单")
+public class MesPcnTask extends BaseBean {
+
+    @Column(name="TASK_CODE")
+    @ApiParam("任务代码")
+    private String taskCode;
+
+    @Column(name="TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name="TASK_DESCRIPTION")
+    @ApiParam("任务描述")
+    private String taskDescription;
+
+    @Column(name="TASK_TYPE")
+    @ApiParam("任务类型")
+    private Integer taskType;
+
+    @Column(name="TASK_MODULE")
+    @ApiParam("任务模块")
+    private String taskModule;
+
+    @Column(name="TASK_CLASS")
+    @ApiParam("任务类名")
+    private String taskClass;
+
+    @Column(name="TASK_PACKAGE")
+    @ApiParam("任务包名")
+    private String taskPackage;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN节点名称")
+    private String pcnName;
+
+    @Column(name="TASK_CYCLE_EXPS")
+    @ApiParam("任务周期表达式")
+    private String taskCycleExps;
+
+    @Column(name="TASK_CYCLE_DESCRIPTION")
+    @ApiParam("任务周期描述")
+    private String taskCycleDescription;
+
+    public int getTaskTypeVal() {
+        return this.taskType == null ? 0 : this.taskType;
+    }
+}

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

@@ -1,17 +1,14 @@
 package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam;
-import org.springframework.stereotype.Repository;
 
 /**
- * @Description :
+ * @Description : 打印模板
  * @Reference   :
- * @Author : jack.jia
- * @CreateDate : 2019-04-02
- * @Modify:
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
  **/
-@Repository
 public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
 }

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

@@ -1,17 +1,14 @@
 package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
-import org.springframework.stereotype.Repository;
 
 /**
- * @Description :
+ * @Description : 打印模板
  * @Reference   :
- * @Author : jack.jia
- * @CreateDate : 2019-04-02
- * @Modify:
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
  **/
-@Repository
 public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
 }

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

@@ -0,0 +1,52 @@
+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.*;
+import java.util.List;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_LABEL_TEMPLATE")
+@Api(value="打印模板",description = "打印模板")
+public class MesLabelTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 5371856566557305323L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam(value ="模板名称")
+    private String templateName;
+
+    @Lob
+    @Column(name="TEMPLATE_CONTENT")
+    @ApiParam(value ="模板内容")
+    private String templateContent;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数拼接")
+    @Transient
+    private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<MesLabelTemplateParam> labelTemplateParamList;
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.*;
+
+/**
+ * @Description : 打印模板参数
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_LABEL_TEMPLATE_PARAM")
+@Api(value="打印模板参数",description = "打印模板参数")
+public class MesLabelTemplateParam extends BaseBean {
+
+    private static final long serialVersionUID = 6476163540527157643L;
+    @Column(name="TEMPLATE_ID")
+    @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_PARAM")
+    @ApiParam(value ="模板参数")
+    private String templateParam;
+
+    @Lob
+    @Column(name="TEMPLATE_PARAM_TEXT")
+    @ApiParam(value ="模板参数描述")
+    private String templateParamText;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数值")
+    @Transient
+    private String templateParamValue;
+}

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

@@ -0,0 +1,50 @@
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: crish
+ * @CreateDate:2019-08-23-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_ERRORLOG")
+@Api("MES_PCN同步异常日志")
+public class MesPcnSyncErrorLog extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="ERROR_SPOT")
+    @ApiParam("异常位置")
+    private String errorSpot;
+
+    @Column(name="ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private String errorContent;
+
+}

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

@@ -0,0 +1,75 @@
+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;
+
+/**
+ * @Description :mes-pcn定时任务工作清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_TASK")
+@Api("mes-pcn定时任务工作清单")
+public class MesPcnTask extends BaseBean {
+
+    @Column(name="TASK_CODE")
+    @ApiParam("任务代码")
+    private String taskCode;
+
+    @Column(name="TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name="TASK_DESCRIPTION")
+    @ApiParam("任务描述")
+    private String taskDescription;
+
+    @Column(name="TASK_TYPE")
+    @ApiParam("任务类型")
+    private Integer taskType;
+
+    @Column(name="TASK_MODULE")
+    @ApiParam("任务模块")
+    private String taskModule;
+
+    @Column(name="TASK_CLASS")
+    @ApiParam("任务类名")
+    private String taskClass;
+
+    @Column(name="TASK_PACKAGE")
+    @ApiParam("任务包名")
+    private String taskPackage;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN节点名称")
+    private String pcnName;
+
+    @Column(name="TASK_CYCLE_EXPS")
+    @ApiParam("任务周期表达式")
+    private String taskCycleExps;
+
+    @Column(name="TASK_CYCLE_DESCRIPTION")
+    @ApiParam("任务周期描述")
+    private String taskCycleDescription;
+
+    public int getTaskTypeVal() {
+        return this.taskType == null ? 0 : this.taskType;
+    }
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+/**
+ * @Description: PCN连接状态统计Model
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-07-14:56
+ * @Modify:
+ **/
+public class MesPcnStatusModel {
+
+    private int healthNodeNumber;
+
+    private int illNodeNumber;
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
+
+/**
+ * @Description : 打印模板
+ * @Reference   :
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
+ **/
+public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+
+/**
+ * @Description : 打印模板
+ * @Reference   :
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
+ **/
+public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncErrorLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: crish
+ * @CreateDate:2019-08-23-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncErrorLogRepository extends BaseRepository<MesPcnSyncErrorLog, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :mes-pcn定时任务清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnTaskRepository extends BaseRepository<MesPcnTask, Long> {
+}

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

@@ -1103,4 +1103,23 @@ public class MesHqlPack {
         packBean.setOrderByStr(numberRule.orderBy());
         return packBean;
     }
+
+    /**
+     * mes-pcn定时任务清单
+     * @param mesPcnTask
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        }
+
+        packBean.setOrderByStr(mesPcnTask.orderBy());
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取打印模板和打印模板参数表的所有信息
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-23-11:38
+ * @Modify:
+ **/
+@Data
+class LabelTemplateAndParamModel implements Serializable {
+    private static final long serialVersionUID = -3612131411549787983L;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 打印模板
@@ -42,7 +43,11 @@ public class SysLabelTemplate extends BaseBean {
     private String templateContent;
 
     // 参数拼接，多参数都好分隔，后台在做处理
-    @ApiParam(value ="模板参数拼接")
     @Transient
+    @ApiParam(value ="模板参数拼接")
     private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<SysLabelTemplateParam> labelTemplateParamList;
 }

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

@@ -81,4 +81,31 @@ public class WmsTaskInfo extends BaseBean {
     @Column(name = "IS_CHECK_SN")
     @ApiParam("是否校验条码")
     public Integer isCheckSn;
+
+    @Transient
+    @ApiParam("计划日期")
+    private String zdate;
+
+    @Transient
+    @ApiParam("计划时间")
+    private String ztime;
+
+    @Transient
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Transient
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    public WmsTaskInfo(){};
+
+    public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+    }
 }

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

@@ -45,7 +45,9 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+        }
 
         return hqlStr;
     }