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

.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

@@ -27,11 +27,14 @@ public class DdlPackBean {
     //是否是hql
     private boolean isHql;
 
-    //排序内容
+    //手动hql，尽量避免直接传参，使用？代替
-    private String orderByStr;
+    private String hqlAppend;
 
     //where后跟着的hql/sql
-    private String whereAppend;
+    private StringBuilder whereAppend;
+
+    //排序内容
+    private String orderByStr;
 
     //需要拼接的hql
     private StringBuilder sb = null;
@@ -39,11 +42,13 @@ 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();
     }
 
     public boolean isHql() {
@@ -62,12 +67,20 @@ public class DdlPackBean {
         this.orderByStr = orderByStr;
     }
 
+    public String getHqlAppend() {
+        return hqlAppend;
+    }
+
+    public void setHqlAppend(String hqlAppend) {
+        this.hqlAppend = hqlAppend;
+    }
+
     public String getWhereAppend() {
-        return whereAppend;
+        return whereAppend.toString();
     }
 
     public void setWhereAppend(String whereAppend) {
-        this.whereAppend = whereAppend;
+        this.whereAppend = new StringBuilder(whereAppend);
     }
 
     public HashMap<String, Object> getHqlPreparedMap() {
@@ -87,7 +100,7 @@ public class DdlPackBean {
             hqlPreparedMap.put(column, val);
         }
 
-        sb.append(hql);
+        whereAppend.append(hql);
     }
 
     /**
@@ -99,6 +112,23 @@ public class DdlPackBean {
     }
 
     /**
+     * 获取包含hql的最终的ddl
+     * @return
+     */
+    public String getPackedHqlAll(){
+        if(hqlAppend != null){
+            sb.append(hqlAppend);
+        }
+        if(whereAppend != null){
+            sb.append(whereAppend);
+        }
+        if(orderByStr != null){
+            sb.append(orderByStr);
+        }
+        return sb.toString();
+    }
+
+    /**
      * 获取最终的ddl
      * @return
      */

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-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -894,8 +894,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public double findByHqlDouble(DdlPackBean packBean) {
         try{
-            Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+            Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class);
-                    + " as model where 1=1 " + packBean.getPackedHql(),Double.class);
 
             for (String key : packBean.getHqlPreparedMap().keySet()) {
                 query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
@@ -1043,7 +1042,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
      */
     private T innerSave(T item) {
         try {
-            if(item==null)return null;
+            if(item ==null) {
+                return null;
+            }
             Class<?> clazz = item.getClass();
 
             //获取主键

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -5,7 +5,9 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import org.apache.commons.lang3.StringUtils;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下
@@ -337,8 +339,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPack(String data, String columnName, DdlPackBean packBean) {
+    public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -363,21 +365,21 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPackString(String data, String columnName, DdlPackBean packBean) {
+    public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null && data.length > 0) {
-            //判断最后一位是不是逗号
+            packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
-            if (data.lastIndexOf(",") != (data.length() - 1)) {
+        }
-                data += ",";
+    }
-            }
+
-            String[] dataArray = data.substring(0, data.length() - 1).split(",");
+    /**
-            data = "";
+     * 封装in String查询语句
-            for (int i = 0; i < dataArray.length; i++) {
+     *
-                if (i == dataArray.length - 1) {
+     * @param data
-                    data += "'" + dataArray[i] + "'";
+     * @param columnName
-                } else {
+     * @param packBean
-                    data += "'" + dataArray[i] + "',";
+     */
-                }
+    public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
-            }
+        if (data != null && data.size() > 0) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }

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;
@@ -705,4 +707,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(value = "拆分请求时间数量列表", example = "1")
-    @ApiParam("单据号")
+    public List<String> reqTimeList;
-    public String orderNo;
 
-    @Column(name = "PART_NO")
+    @ApiParam(value = "分页列表", example = "1")
-    @ApiParam(value = "零件号")
+    public ListPager<SwebPOForPubListResultItemModel> pageList;
-    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-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/WmsCSOrderDetails.java

@@ -103,6 +103,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
+    @Transient
+    @ApiParam("目标库位编号")
+    public String descLocateNo;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -43,7 +43,7 @@ public class WmsCSOrderMaster extends BaseBean {
     public Integer orderType;
 
     @Column(name = "ORDER_STATUS")
-    @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中  30-盘点完成  40-已解冻  50-已关闭)", example = "1")
+    @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
     public Integer orderStatus;
 
     @Column(name = "ACTION_PERSENT")

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

@@ -163,4 +163,8 @@ public class WmsDocMovementDetails extends BaseBean {
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
 
     public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
+
+    public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); }
+
+    public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); }
 }

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

@@ -96,19 +96,19 @@ public class WmsLocate extends BaseBean {
     private Double partQty;
 
     public Integer getMaxPackageQty() {
-        return this.maxPackageQty == null ? 0 : this.maxPackageQty;
+        return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }
 
     public Double getMaxPartQty() {
-        return this.maxPartQty == null ? 0 : this.maxPartQty;
+        return this.maxPartQty == null ? 0 : this.maxPartQty.doubleValue();
     }
 
     public Integer getBoxQty() {
-        return this.boxQty == null ? 0 : this.boxQty;
+        return this.boxQty == null ? 0 : this.boxQty.intValue();
     }
 
     public Double getPartQty() {
-        return this.partQty == null ? 0 : this.partQty;
+        return this.partQty == null ? 0 : this.partQty.doubleValue();
     }
 
 }

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

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

@@ -123,12 +123,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
         DdlPackBean packBean = new DdlPackBean();
-        StringBuffer orderNoStr = new StringBuffer();
+        DdlPreparedPack.getInPack(orderNos, "orderNo", packBean);
-        for (int i = 0; i < orderNos.size(); i++) {
-            orderNoStr.append("'" + orderNos.get(i) + "',");
-        }
-        orderNoStr.deleteCharAt(orderNoStr.length() - 1);
-        DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getOrderByPack(
@@ -1128,6 +1123,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
+        HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);