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/jpa/daoimpl/BaseRepositoryImpl.java

@@ -261,10 +261,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> listPager(Pager pager) {
+        if(pager.getTotalRows() > 0) {
             return entityManager.createQuery("from " + persistentClass.getName())
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
                     .getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
@@ -474,14 +478,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
+        if(pager.getTotalRows() > 0){
             String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
             return entityManager.createQuery(queryString)
                         .setParameter(propertyName, value)
                         .getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
     public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
+        if(pager.getTotalRows() > 0){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -509,6 +518,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
 
             return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
@@ -594,6 +606,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
+        if(pager.getTotalRows() > 0){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -620,10 +633,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
 
             return queryObject.getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
+        if(pager.getTotalRows() > 0) {
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -635,6 +652,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
                     .getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
@@ -680,6 +700,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(String hqlWhere, Pager pager) {
+        if(pager.getTotalRows() > 0){
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -691,10 +712,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
                         .setFirstResult(pager.getStartRow())
                         .setMaxResults(pager.getPageSize())
                         .getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
     public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
+        if(pager.getTotalRows() > 0) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -705,6 +730,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             return queryObject.setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
                     .getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
@@ -719,18 +747,26 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List findBySqlPage(String sql, Pager pager) {
+        if(pager.getTotalRows() > 0) {
             return entityManager.createNativeQuery(sql)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
                     .getResultList();
+        }else{
+            return new ArrayList();
+        }
     }
 
     @Override
     public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
+        if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql,entity)
                         .setFirstResult(pager.getStartRow())
                         .setMaxResults(pager.getPageSize())
                         .getResultList();
+        }else{
+            return new ArrayList();
+        }
     }
 
     @Override
@@ -793,6 +829,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
+        if(pager.getTotalRows() > 0) {
             StringBuffer queryString = new StringBuffer();
 
             queryString.append(hql + " as model where 1=1 ");
@@ -804,6 +841,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             queryString.append(" " + orderByStuff);
 
             return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
+        }else{
+            return new ArrayList<T>();
+        }
     }
 
     @Override
@@ -825,11 +865,16 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
+        if(pager.getTotalRows() > 0){
             return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
+        }else{
+            return new ArrayList<Object[]>();
+        }
     }
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
+        if(pager.getTotalRows() > 0) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -838,6 +883,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
 
             return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
+        }else{
+            return new ArrayList<Object[]>();
+        }
     }
 
     @Override
@@ -847,10 +895,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
+        if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql)
                         .setFirstResult(pager.getStartRow())
                         .setMaxResults(pager.getPageSize())
                         .getResultList();
+        }else{
+            return new ArrayList<Object[]>();
+        }
     }
 
     /**

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/bean/SysTool.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,13 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_TOOL")
+@Table(name="SYS_TOOL",indexes =
+                        {
+                            @Index(name="sys_tool_tool_type_idx",columnList = "tool_type_id"),
+                            @Index(name="sys_tool_tool_status_idx",columnList = "TOOL_STATUS"),
+                            @Index(name="sys_tool_tool_conn_type_idx",columnList = "TOOL_CONN_TYPE"),
+                            @Index(name="sys_tool_tool_data_type_idx",columnList = "TOOL_DATA_TYPE")
+                        })
 @Api(value="硬件设备表",description = "硬件设备表")
 public class SysTool extends BaseBean {
 

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

@@ -667,4 +667,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();
+    }
 }