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

.gitignore

@@ -12,3 +12,4 @@ target
 .class
 .md
 .log
+*.iml

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

@@ -1069,7 +1069,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_ITEM_STATUS {
         NORMAL(10, "创建"),
-        CANCELLATION(20, "行取消");
+        CANCELLATION(20, "已处理");
 
         private int value;
         private String description;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -43,10 +43,19 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器类型")
     private Integer interceptType;
 
+    // 枚举 BlockFormEnumUtil.INTERCEPT_POSITION
     @Column(name="INTERCEPT_POSITION")
     @ApiParam(value ="拦截器位置")
     private Integer interceptPosition;
 
+    public Integer getInterceptPosition() {
+        if(this.interceptPosition == null){
+            return null;
+        } else {
+            return this.interceptPosition.intValue();
+        }
+    }
+
     @Column(name="INTERCEPT_TARGET_ID")
     @ApiParam(value ="拦截目标id")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -34,7 +34,15 @@ public class SysFile extends BaseBean {
     @Column(name="NAME")
     @ApiParam(value ="文件名称")
     private String name;
- 
+
+    @Column(name="FILE_CODE")
+    @ApiParam(value ="文件代码")
+    private String fileCode;
+
+    @Column(name="FILE_SOFT_TYPE")
+    @ApiParam(value ="文件所属模块")
+    private Integer fileSoftType;
+
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -51,11 +59,11 @@ public class SysFile extends BaseBean {
     @Column(name="FILE_PATH")
     @ApiParam(value ="文件路径")
     private String filePath;
- 
+
     @Column(name="FILE_ORIGINAL_NAME")
     @ApiParam(value ="原始文件名称")
     private String fileOriginalName;
- 
+
     @Column(name="FILE_TYPE_ID")
     @ApiParam(value ="文件类型ID")
     private Long fileTypeId;
@@ -67,11 +75,11 @@ public class SysFile extends BaseBean {
     @Column(name="FILE_TYPE_NAME")
     @ApiParam(value ="文件类型名称")
     private String fileTypeName;
- 
+
     @Column(name="FILE_SIZE")
     @ApiParam(value ="文件大小(KB)" , example ="0")
     private Integer fileSize;
- 
+
     @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
     private Integer downloadNum;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.apache.commons.lang3.StringUtils;
@@ -704,4 +706,22 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+
+
+    /**
+     * 文件代码是否存在
+     * @param sysFile 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlSysFileCode(SysFile sysFile){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        // and
+        DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean);
+        // not
+        DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

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

@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -22,7 +23,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("返回前端数据实体")
-public class WmsActionResponseBean<Obj> {
+public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("回显BARCODE值")
     public Map<String, Obj> barCode;

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Description : 可选项模型
@@ -8,8 +11,13 @@ import lombok.Data;
  * @Author : silliter.yuan
  * @CreateDate : 2018-11-30 10:50
  * @Modify:
+ * 2019-04-03 15:42 Rock.Yu
+ *  1. 增加了构造方法和构建器的注解
  **/
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class WmsOptionModel {
 
     private String code;

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

@@ -11,4 +11,10 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 * @Modify:
 **/
 public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
+    /**
+     * 按照条码查询实体
+     * @param sn 条码
+     * @return 库存条码实体
+     */
+    WmsStockSn findFirstBySn(String sn);
 }