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

@@ -1,7 +1,5 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
-import javafx.scene.text.Font;
-
 import java.util.HashMap;
 
 /**
@@ -41,13 +39,11 @@ public class DdlPackBean {
 
     public DdlPackBean(){
         this.isHql = true;
-        sb = new StringBuilder();
         whereAppend = new StringBuilder();
     }
 
     public DdlPackBean(boolean isHql){
         this.isHql = isHql;
-        sb = new StringBuilder();
         whereAppend = new StringBuilder();
     }
 
@@ -116,6 +112,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHqlAll(){
+        sb = new StringBuilder();
         if(hqlAppend != null){
             sb.append(hqlAppend);
         }
@@ -133,6 +130,7 @@ public class DdlPackBean {
      * @return
      */
     public String getPackedHql(){
+        sb = new StringBuilder();
         if(whereAppend != null){
             sb.append(whereAppend);
         }

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

@@ -917,7 +917,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 盘点实盘 处理状态
+     * 盘点实盘 处理状态;质检操作明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ITEM_STATUS {
@@ -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

@@ -35,6 +35,14 @@ public class SysFile extends BaseBean {
     @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)

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;
@@ -398,6 +400,40 @@ public class CoreHqlPack {
     }
 
     /**
+     * 账号复杂查询
+     * @param user
+     * @return
+     */
+    public static DdlPackBean packDdlSysUser(SysUser user){
+        DdlPackBean ddlPack = new DdlPackBean();
+
+        // And X = X
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack);
+        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack);
+        DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack);
+
+        if(user.getRoleIdList() != null){
+            DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack);
+        }
+
+        if(user.getDepartmentIdList() != null){
+            DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack);
+        }
+
+        // And Like % %
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack);
+
+        // 添加默认排序
+        DdlPreparedPack.getOrderDefault(user);
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack);
+
+        return  ddlPack;
+    }
+
+    /**
      * 查询字典代码是否重复
      * @param dictionary
      * @return
@@ -704,4 +740,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-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -33,6 +33,14 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("单据号")
     public String orderNo;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "PART_VERSION")
     @ApiParam("零件版本")
     private Integer partVersion;
@@ -45,6 +53,10 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam(value = "零件名称")
     private String partName;
 
+    @ApiParam(value = "订单类型", example = "1")
+    @Column(name = "ORDER_TYPE")
+    public Integer orderType;
+
     @ApiParam("零件类型")
     @Column(name = "PART_TYPE")
     private Integer partType;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 待发布订单列表输出模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-02 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOForPubListResultItemModel extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    public String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam(value = "订单状态", example = "1")
+    @Column(name = "ITEM_STATUS")
+    private Integer itemStatus;
+
+    @ApiParam(value = "订单类型", example = "1")
+    @Column(name = "ORDER_TYPE")
+    public Integer orderType;
+
+    @ApiParam(value = "时间数量列表", example = "1")
+    public List<Map<String,Double>> timeList;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.pojo.sweb.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import org.hibernate.annotations.ColumnDefault;
 
-import javax.persistence.Column;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : 待发布订单列表输出模型
@@ -19,30 +17,9 @@ import java.util.Map;
 @Data
 public class SwebPOForPubListResultModel extends BaseBean {
 
-    @Column(name = "ORDER_NO")
-    @ApiParam("单据号")
-    public String orderNo;
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    public List<String> reqTimeList;
 
-    @Column(name = "PART_NO")
-    @ApiParam(value = "零件号")
-    private String partNo;
-
-    @Column(name = "PART_NAME")
-    @ApiParam(value = "零件名称")
-    private String partName;
-
-    @ApiParam(value = "单位")
-    @Column(name = "UNIT")
-    private String unit;
-
-    @ApiParam(value = "订单状态", example = "1")
-    @Column(name = "ITEM_STATUS")
-    private Integer itemStatus;
-
-    @ApiParam(value = "订单类型", example = "1")
-    @Column(name = "ORDER_TYPE")
-    public Integer orderType;
-
-    @ApiParam(value = "时间数量列表", example = "1")
-    public List<Map<String,Double>> timeList;
+    @ApiParam(value = "分页列表", example = "1")
+    public ListPager<SwebPOForPubListResultItemModel> pageList;
 }

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

@@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
-    public Double  getMix() {
+    public Double  getMin() {
         return this.min == null ? 0 : this.min;
     }
 

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);
 }