Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -1372,7 +1372,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
         CREATE(10, "新建"),
-        FINISH(20, "待处理"),
+        FINISH(20, "处理中"),
         FAIL(30, "已完成"),
         CLOSE(40, "已关闭"),
         CANCEL(50, "已取消");

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 打印模板封装model
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 13:52
+ * @Modify:
+ **/
+@Data
+public class LabelTemplateModel {
+
+    private SysLabelTemplate labelTemplate;
+
+    private List<SysLabelTemplateParam> templateParamList;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.platform.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 javax.persistence.Transient;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_LABELTEMPLATE")
+@Api(value="打印模板",description = "打印模板")
+public class SysLabelTemplate extends BaseBean {
+
+    @Column(name="TEMPLATECODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATENAME")
+    @ApiParam(value ="模板名称")
+    private String templateName;
+
+    @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT")
+    @ApiParam(value ="模板内容")
+    private String templateContent;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数拼接")
+    @Transient
+    private String paramsPack;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.platform.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 打印模板参数
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_LABELTEMPLATEPARAM")
+@Api(value="打印模板参数",description = "打印模板参数")
+public class SysLabelTemplateParam extends BaseBean {
+
+    @Column(name="TEMPLATEID")
+    @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
+    @Column(name="TEMPLATECODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATEPARAM")
+    @ApiParam(value ="模板参数")
+    private String templateParam;
+
+    @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT")
+    @ApiParam(value ="模板参数描述")
+    private String templateParamText;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数值")
+    @Transient
+    private String templateParamValue;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java

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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java

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

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

@@ -665,4 +665,40 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 打印模板复杂查询
+     * @param sysLabelTemplate
+     * @return
+     */
+    public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result);
+        HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result);
+
+        // 添加默认排序
+        HqlPack.getOrderDefault(sysLabelTemplate);
+
+        return result.toString();
+    }
+
+    /**
+     * 打印模板参数复杂查询
+     * @param sysLabelTemplateParam
+     * @return
+     */
+    public static String packHqlSysLabelTemplateParams(SysLabelTemplateParam sysLabelTemplateParam) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result);
+        HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result);
+
+        // 添加默认排序
+        HqlPack.getOrderDefault(sysLabelTemplateParam);
+
+        return result.toString();
+    }
 }

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

@@ -69,6 +69,12 @@ public class WmsActionResponseBean<Obj> {
     public Boolean isBtnDisabled = true;
 
     /**
+     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     */
+    @ApiParam(value = "按钮是否禁用")
+    public Boolean isDetailsBtnDisabled = true;
+
+    /**
      * 与 toSelected 属性配合使用，
      * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
      */

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.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 org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description : 作业任务生成日志
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-03-18 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TASK_CREATE_LOG")
+@Api("作业任务生成日志表")
+public class WmsTaskCreateLog extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务单号")
+    public String taskNo;
+
+    @Column(name = "DATA_SRC")
+    @ApiParam("数据来源")
+    public String dataSrc;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam("作业类型")
+    public String opTypeCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("错误信息")
+    public String errorMessage;
+
+    @Column(name = "TRANS_STATUS")
+    @ApiParam("处理状态")
+    public Integer transStatus;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("实现类")
+    public String callClass;
+
+    @Column(name = "CALL_FUN")
+    @ApiParam("实现类")
+    public String callFun;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始执行时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    public Date startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束执行时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    public Date endTime;
+
+    @Column(name = "IN_PARAMS")
+    @ApiParam(value = "输入参数")
+    private String inParams;
+
+    @Column(name = "OUT_PARAMS")
+    @ApiParam(value = "输出参数")
+    private String outParams;
+
+    @Column(name = "OUT_RESULT")
+    @ApiParam(value = "执行结果")
+    private String outResult;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog;
+
+/**
+ * @Description : 作业任务生成日志
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-03-18 15:58
+ * @Modify:
+ **/
+public interface WmsTaskCreateLogRepository extends BaseRepository<WmsTaskCreateLog, Long> {
+}

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

@@ -1434,4 +1434,37 @@ public class WmsHqlPack {
         getStringBuilderPack(taskDetails, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询任务生成日志
+     * @param wmsTaskCreateLog
+     * @return
+     */
+    public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
+        HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
+        getStringBuilderPack(wmsTaskCreateLog, result);
+        return result.toString();
+    }
+
+    /**
+     * 根据条件查询作业处理组件
+     * @param wmsTransModule
+     * @return
+     */
+    public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
+        StringBuffer result = new StringBuffer();
+        if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){
+            HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
+        }
+        if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){
+            HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
+        }
+        if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){
+            HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
+        }
+        getStringBuilderPack(wmsTransModule, result);
+        return result.toString();
+    }
 }