流程管家新增日志bug修改

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 操作数据库表数据 参数封装
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-04-11 11:50
+ * @Modify:
+ **/
+@Data
+public class OperationDbModle{
+
+    @ApiParam(value = "DAO名称")
+    public String daoName;
+
+    @ApiParam(value = "数据操作实体")
+    public Object object;
+
+    // 10:新增，20：修改
+    @ApiParam(value = "数据库操作类型")
+    public int actionDbType;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogData;
+
+/**
+ * @Description : 作业日志参数(使用Mongodb)
+ * @Reference   :
+ * @Author      : siliter
+ * @Date        : 2019-04-11 12:03:00
+ * @Modify      :
+ **/
+public interface WmsActionLogDataMongoRepository extends BaseMongoRepository<WmsActionLogData, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogDetails;
+
+/**
+ * @Description : 作业日志明细(使用Mongodb)
+ * @Reference   :
+ * @Author      : siliter
+ * @Date        : 2019-04-11 12:03:00
+ * @Modify      :
+ **/
+public interface WmsActionLogDetailsMongoRepository extends BaseMongoRepository<WmsActionLogDetails, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLog;
+
+/**
+ * @Description : 作业日志(使用Mongodb)
+ * @Reference   :
+ * @Author      : siliter
+ * @Date        : 2019-04-11 12:03:00
+ * @Modify      :
+ **/
+public interface WmsActionLogMongoRepository extends BaseMongoRepository<WmsActionLog, Long> {
+}

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.platform.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
+import cn.estsh.i3plus.pojo.platform.platbean.*;
+import com.mongodb.BasicDBObject;
+import org.bson.conversions.Bson;
+
+/**
+ * @Description : Bson对象封装
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-04-11 13:15
+ * @Modify:
+ **/
+public class WmsBsonPack {
+
+    /**
+     * 作业日志复杂查询
+     *
+     * @param actionLog
+     * @return
+     */
+    public static Bson packBsonByActionLog(WmsActionLog actionLog) {
+        Bson bson = new BasicDBObject();
+        bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
+        return bson;
+    }
+
+    /**
+     * 作业日志明细复杂查询
+     *
+     * @param actionLogDetails
+     * @return
+     */
+    public static Bson packBsonByActionLogDetails(WmsActionLogDetails actionLogDetails) {
+        Bson bson = new BasicDBObject();
+        bson = BsonPackTool.getNumEqualPack(actionLogDetails.getAlId(), "alId", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", bson);
+        return bson;
+    }
+
+    /**
+     * 调用组件日志复杂查询
+     *
+     * @param actionLogData
+     * @return
+     */
+    public static Bson packBsonByActionLogData(WmsActionLogData actionLogData) {
+        Bson bson = new BasicDBObject();
+        bson = BsonPackTool.getNumEqualPack(actionLogData.getAldId(), "aldId", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLogData.getIsValid(), "isValid", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", bson);
+        return bson;
+    }
+}