Merge branch 'test'

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

@@ -2700,7 +2700,8 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
-        AMP("AMP", "AMP系统");
+        AMP("AMP", "AMP系统"),
+        ZSLD("ZSLD", "直送拉动");
 
         private String value;
         private String description;
@@ -2994,6 +2995,7 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
         public String getDescription() {
             return description;
         }
@@ -3022,4 +3024,84 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 物料结算标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_CLOSE_FLAG {
+        INTERNAL_SETTLEMENT("1", "内部结算"),
+        NOMAL_SETTLEMENT("2", "正常结算");
+
+        private String value;
+        private String description;
+
+        OUT_CLOSE_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 物料结算方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_CLOSE_TYPE {
+        OFF_LINE_SETTLEMENT("10", "下线结算"),
+        PICK_SETTLEMENT("20", "配料结算");
+
+        private String value;
+        private String description;
+
+        OUT_CLOSE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 定时任务参数解析Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/17 16:25
+ * @Modify
+ */
+@Data
+public class WmsJobParamModel implements Serializable {
+    private String organizeCode;
+    private List<String> zonesNoList;
+    private Integer snType;
+}

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

@@ -134,6 +134,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("項目结算标识")
     private String outCloseFlag = "2";
 
+    @Column(name = "OUT_CLOSE_TYPE")
+    @ApiParam("结算方式")
+    private String outCloseType;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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

@@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "存储区集合")
     private List<String> zoneList;
 
+    @Transient
+    @ApiParam(value = "移动单条码集合")
+    private List<WmsMoveSn> wmsMoveSnList;
+
 
     public String getAreaNo() {
         return areaNo;
@@ -222,6 +226,7 @@ public class WmsStockQuan extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
     }
+
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShipping;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 对象持久层仓用方法控制(产品发运表)
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/17 15:54
+ * @Modify
+ */
+@Repository
+public interface WmsShippingRepository extends BaseRepository<WmsShipping, Long> {
+}

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

@@ -177,6 +177,7 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     *
      * @param wmsRoutingDetail
      * @return
      */
@@ -208,6 +209,7 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     *
      * @param wmsRoutingAssign
      * @return
      */
@@ -555,6 +557,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
         //特殊发货标志
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
+        //单据来源
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
 
         getStringBuilderPack(wmsShipping, result);
 
@@ -879,6 +883,7 @@ public class WmsHqlPack {
 
         return result;
     }
+
     /**
      * 业务：库存表报查询封装
      *
@@ -930,6 +935,7 @@ public class WmsHqlPack {
 
         return result;
     }
+
     /**
      * 业务：物料包装查询封装
      *
@@ -1132,6 +1138,7 @@ public class WmsHqlPack {
 
     /**
      * 条码状态查询报表查询条件
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1445,6 +1452,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
+
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
+        DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
+        if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) {
+            result.setOrderByStr(wmsStockSn.getOrderByParam());
+        }
         getStringBuilderPack(wmsStockSn, result);
         return result;
     }
@@ -1561,6 +1575,7 @@ public class WmsHqlPack {
 
     /**
      * 把 List<Map> 中的一组数据重新封装到List<String>中
+     *
      * @param mapList
      * @param keyName
      */
@@ -1575,6 +1590,7 @@ public class WmsHqlPack {
 
     /**
      * 把 List<Map> 中的一组查询条件封装成 HQL
+     *
      * @param mapList
      * @param keyName
      * @param columnName
@@ -1956,6 +1972,7 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
+
     /**
      * 主数据信息 分页查询
      *