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/enumutil/WmsEnumUtil.java

@@ -1464,7 +1464,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPONENT_TYPE {
 
-        PROCESS_HANDLING(10, "流程处理组件,"),
+        PROCESS_HANDLING(10, "流程处理组件"),
         PROCESS_INITIALIZATION(20, "流程初始化组件"),
         PROCESS_COMMIT(30, "流程提交组件"),
         DETAIL_PROCESS(40, "明细处理组件"),

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

@@ -32,6 +32,17 @@ public class WmsBsonPack {
         bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
+
+        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
+                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+            bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true);
+        }
+
+        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
+                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+            bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true);
+        }
+
         return bson;
     }
 

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

@@ -170,10 +170,25 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     * @param wmsRoutingDetail
+     * @return
+     */
+    public static DdlPackBean packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result);
+
+        getStringBuilderPack(wmsRoutingDetail, result);
+        return result;
+    }
+
+    /**
+     * 物流路线子表查询条件封装
      *
      * @param routingCode
      * @return
      */
+    @Deprecated
     public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
         DdlPackBean result = new DdlPackBean();
 
@@ -184,6 +199,19 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 物流路线子表查询条件封装
+     * @param wmsRoutingAssign
+     * @return
+     */
+    public static DdlPackBean packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
+
+        getStringBuilderPack(wmsRoutingAssign, result);
+        return result;
+    }
 
     /**
      * 物流路线主表查询条件封装
@@ -540,6 +568,10 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
         //供应商编号
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
+        //关联单号
+        DdlPreparedPack.getStringLikerPack(wmsCheckFactRecord.getRefSrc(), "refSrc", result);
+        //关联单单据类型
+        DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getRefType(), "refType", result);
 
         getStringBuilderPack(wmsCheckFactRecord, result);