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

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

@@ -739,7 +739,9 @@ public class CoreHqlPack {
         // hql拼接
         HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result);
         HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result);
-
+        HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsDeleted(), "isDeleted", result);
+        HqlPack.getStringEqualPack(sysLabelTemplateParam.getOrganizeCode(), "organizeCode", result);
         // 添加默认排序
         HqlPack.getOrderDefault(sysLabelTemplateParam);
 

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

@@ -27,6 +27,7 @@ public class WmsBsonPack {
         bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson);
         bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson);
+        bson = BsonPackTool.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", bson);
         bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson);
         bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);

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

@@ -35,6 +35,10 @@ public class WmsActionModuleParam extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long amID;
 
+    @Column(name = "METHOD_NAME")
+    @ApiParam("组件执行方法名称")
+    public String methodName;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数编码")
     public String paramCode;