From 192817f8e8e416db5e5303ed351193b80fbce831 Mon Sep 17 00:00:00 2001
From: lml <1297555865@qq.com>
Date: Wed, 14 Oct 2026 09:01:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/online/dto/OnlinePluginExecuteDto.java  |  8 +++++
 .../service/impl/OnlineOperationServiceImpl.java   | 40 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/common/common-online/src/main/java/apelet/common/online/dto/OnlinePluginExecuteDto.java b/common/common-online/src/main/java/apelet/common/online/dto/OnlinePluginExecuteDto.java
index 7a369e3..ddf92a4 100644
--- a/common/common-online/src/main/java/apelet/common/online/dto/OnlinePluginExecuteDto.java
+++ b/common/common-online/src/main/java/apelet/common/online/dto/OnlinePluginExecuteDto.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Map;
 
 /**
  * 在线表单插件操作执行dto
@@ -31,4 +32,11 @@ public class OnlinePluginExecuteDto {
     @Schema(description = "billId")
     @NotNull(message = "数据验证失败，formId不能为空！")
     private String billId;
+
+    @Schema(description = "是否选择全部")
+    private Boolean isSelectAll;
+
+
+    @Schema(description = "列表筛选条件")
+    private Map<String, Object> queryParams;
 }
diff --git a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineOperationServiceImpl.java b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineOperationServiceImpl.java
index f4020b4..ed05370 100644
--- a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineOperationServiceImpl.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineOperationServiceImpl.java
@@ -53,6 +53,7 @@ import apelet.common.orm.impl.*;
 import apelet.common.redis.util.CommonRedisUtil;
 import apelet.common.sequence.wrapper.IdGeneratorWrapper;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
@@ -1085,6 +1086,15 @@ public class OnlineOperationServiceImpl implements OnlineOperationService {
         }
         OnlineTable onlineTable = onlineTableService.getOnlineTableFromCache(onlineForm.getMasterTableId());
         OnlFormHead onlFormHead = onlFormHeadService.getHeadTableNameCache(onlineTable.getTableName());
+        if (BooleanUtil.isTrue(onlinePluginExecuteDto.getIsSelectAll())) {
+            List<String> allBillIds = this.queryAllBillIds(onlineTable, onlinePluginExecuteDto.getQueryParams());
+            if (CollUtil.isEmpty(allBillIds)) {
+                OperationResult empty = new OperationResult();
+                empty.setMessage("没有符合条件的数据！");
+                return empty;
+            }
+            onlinePluginExecuteDto.setBillId(CollUtil.join(allBillIds, ","));
+        }
         // executePlugin 是所有按钮的统一入口，附件的写入/清理必须按插件类型分别设闸，
         // 否则「审核」这类只提交部分字段的按钮会把附件全量覆盖掉，「删除」则不会清理附件。
         boolean saveOperation = this.containsPlugin(sortDtoList, SaveOperationServicePlugIn.class);
@@ -1122,6 +1132,36 @@ public class OnlineOperationServiceImpl implements OnlineOperationService {
     }
 
     /**
+     * 按列表筛选条件查询主表全部主键，用于"选择全部按钮"。
+     * queryParams 为 {列名: 值} 的等值条件；为空表示无筛选（即整表）。
+     */
+    private List<String> queryAllBillIds(OnlineTable masterTable, Map<String, Object> queryParams) {
+        List<String> billIds = new ArrayList<>();
+        Filter filter = new Filter();
+        if (MapUtil.isNotEmpty(queryParams)) {
+            queryParams.forEach((column, value) -> {
+                if (value == null || "".equals(value)) {
+                    return;      // 空条件不过滤，与列表查询语义保持一致
+                }
+                filter.add(new FilterItem(column, FilterItem.equals, value));
+            });
+        }
+        Selector selector = new Selector();
+        selector.getList().add(new SelectorItem("id"));
+        ObjectCollection collection = ormGenDataSourceUtil.query(masterTable.getTableName(), filter, selector);
+        if (collection == null || collection.isEmpty()){
+            return new ArrayList<>();
+        }
+        for (int i = 0; i < collection.size(); i++) {
+            Object id = collection.getObject(i).get("id");
+            if (id != null) {
+                billIds.add(id.toString());
+            }
+        }
+        return billIds;
+    }
+
+    /**
      * 判断当前按钮绑定的插件中是否包含指定插件。
      * <p>按钮与插件的绑定是 widgetJson 中 pluginList[].class 的全限定类名(见 QuickFormWidgetUtil#setSaveButtonEnabled)，
      * 用类名判断比用中文 buttonName 可靠。</p>
-- 
2.9.0.windows.1


From 845af296ec673897a630da7c599a1d4c08c1b9be Mon Sep 17 00:00:00 2001
From: lml <1297555865@qq.com>
Date: Fri, 16 Oct 2026 18:01:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=8F=8D=E5=86=99=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB=E4=BB=A5=E5=8F=8A=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/common-botp/pom.xml                         |   6 +-
 .../controller/ReverseWritingRulesController.java  |  10 +-
 .../botp}/dao/ReverseWritingBusinessMapper.java    |   5 +-
 .../botp}/dao/ReverseWritingFormulaMapper.java     |   4 +-
 .../botp}/dao/ReverseWritingRulesMapper.java       |   4 +-
 .../dao/mapper/ReverseWritingBusinessMapper.xml    |   2 +-
 .../dao/mapper/ReverseWritingFormulaMapper.xml     |   2 +-
 .../botp}/dao/mapper/ReverseWritingRulesMapper.xml |   2 +-
 .../common/botp}/dto/ReverseWritingRulesDto.java   |  11 +-
 .../botp/model/ConvertFieldmappingEntry.java       |  12 ++
 .../apelet/common/botp/model/ConvertRelation.java  |   3 +
 .../java/apelet/common/botp/model/ConvertRule.java |  21 ++
 .../common/botp}/model/ReverseWritingBusiness.java |   2 +-
 .../common/botp}/model/ReverseWritingFormula.java  |   8 +-
 .../common/botp}/model/ReverseWritingRules.java    |  26 ++-
 .../common/botp/plugin/ReverseWritingPlugIn.java   |   8 +-
 .../service/IReverseWritingBusinessService.java    |   4 +-
 .../service/IReverseWritingFormulaService.java     |   4 +-
 .../botp}/service/IReverseWritingRulesService.java |   6 +-
 .../impl/ReverseWritingBusinessServiceImpl.java    |   9 +-
 .../impl/ReverseWritingFormulaServiceImpl.java     |   9 +-
 .../impl/ReverseWritingRulesServiceImpl.java       |  21 +-
 .../plugin/pre/AuditOperationServicePlugIn.java    | 226 ++++++++++-----------
 .../plugin/pre/RevokeOperationServicePlugIn.java   |  12 +-
 .../plugin/pre/SaveOperationServicePlugIn.java     | 208 +++++++++----------
 common/pom.xml                                     |   1 +
 26 files changed, 345 insertions(+), 281 deletions(-)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/controller/ReverseWritingRulesController.java (93%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/ReverseWritingBusinessMapper.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/ReverseWritingFormulaMapper.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/ReverseWritingRulesMapper.java (71%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/mapper/ReverseWritingBusinessMapper.xml (66%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/mapper/ReverseWritingFormulaMapper.xml (67%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dao/mapper/ReverseWritingRulesMapper.xml (84%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/dto/ReverseWritingRulesDto.java (66%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/model/ReverseWritingBusiness.java (97%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/model/ReverseWritingFormula.java (92%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/model/ReverseWritingRules.java (66%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/IReverseWritingBusinessService.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/IReverseWritingFormulaService.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/IReverseWritingRulesService.java (67%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/impl/ReverseWritingBusinessServiceImpl.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/impl/ReverseWritingFormulaServiceImpl.java (60%)
 rename common/{common-generator/src/main/java/apelet/common/generator => common-botp/src/main/java/apelet/common/botp}/service/impl/ReverseWritingRulesServiceImpl.java (80%)

diff --git a/common/common-botp/pom.xml b/common/common-botp/pom.xml
index 1fc7b12..f121380 100644
--- a/common/common-botp/pom.xml
+++ b/common/common-botp/pom.xml
@@ -17,17 +17,17 @@
         <dependency>
             <groupId>apelet</groupId>
             <artifactId>common-core</artifactId>
-            <version>1.0.0</version>
+            <version>${common-core.version}</version>
         </dependency>
         <dependency>
             <groupId>apelet</groupId>
             <artifactId>common-generator</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.5</version>
         </dependency>
         <dependency>
             <groupId>apelet</groupId>
             <artifactId>common-online</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/common/common-generator/src/main/java/apelet/common/generator/controller/ReverseWritingRulesController.java b/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java
similarity index 93%
rename from common/common-generator/src/main/java/apelet/common/generator/controller/ReverseWritingRulesController.java
rename to common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java
index 92a907e..8203af4 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/controller/ReverseWritingRulesController.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java
@@ -1,5 +1,11 @@
-package apelet.common.generator.controller;
+package apelet.common.botp.controller;
 
+import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.model.ReverseWritingFormula;
+import apelet.common.botp.model.ReverseWritingRules;
+import apelet.common.botp.service.IReverseWritingBusinessService;
+import apelet.common.botp.service.IReverseWritingFormulaService;
+import apelet.common.botp.service.IReverseWritingRulesService;
 import apelet.common.core.annotation.MyRequestBody;
 import apelet.common.core.constant.ErrorCodeEnum;
 import apelet.common.core.exception.MyRuntimeException;
@@ -7,7 +13,7 @@ import apelet.common.core.object.MyPageData;
 import apelet.common.core.object.MyPageParam;
 import apelet.common.core.object.ResponseResult;
 import apelet.common.core.util.MyPageUtil;
-import apelet.common.generator.dto.ReverseWritingRulesDto;
+import apelet.common.botp.dto.ReverseWritingRulesDto;
 import apelet.common.generator.model.*;
 import apelet.common.generator.service.*;
 import cn.hutool.core.util.ObjectUtil;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingBusinessMapper.java b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingBusinessMapper.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingBusinessMapper.java
rename to common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingBusinessMapper.java
index 2c4ce4c..60609fa 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingBusinessMapper.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingBusinessMapper.java
@@ -1,6 +1,7 @@
-package apelet.common.generator.dao;
+package apelet.common.botp.dao;
 
-import apelet.common.generator.model.ReverseWritingBusiness;
+
+import apelet.common.botp.model.ReverseWritingBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface ReverseWritingBusinessMapper extends BaseMapper<ReverseWritingBusiness> {
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingFormulaMapper.java b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingFormulaMapper.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingFormulaMapper.java
rename to common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingFormulaMapper.java
index 44955fc..63c70a2 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingFormulaMapper.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingFormulaMapper.java
@@ -1,6 +1,6 @@
-package apelet.common.generator.dao;
+package apelet.common.botp.dao;
 
-import apelet.common.generator.model.ReverseWritingFormula;
+import apelet.common.botp.model.ReverseWritingFormula;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface ReverseWritingFormulaMapper extends BaseMapper<ReverseWritingFormula> {
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingRulesMapper.java b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingRulesMapper.java
similarity index 71%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingRulesMapper.java
rename to common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingRulesMapper.java
index de70d6d..c90b234 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/ReverseWritingRulesMapper.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/ReverseWritingRulesMapper.java
@@ -1,6 +1,6 @@
-package apelet.common.generator.dao;
+package apelet.common.botp.dao;
 
-import apelet.common.generator.model.ReverseWritingRules;
+import apelet.common.botp.model.ReverseWritingRules;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingBusinessMapper.xml b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingBusinessMapper.xml
similarity index 66%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingBusinessMapper.xml
rename to common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingBusinessMapper.xml
index 3d436b5..8761d06 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingBusinessMapper.xml
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingBusinessMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="apelet.common.generator.dao.ReverseWritingBusinessMapper">
+<mapper namespace="apelet.common.botp.dao.ReverseWritingBusinessMapper">
 
 </mapper>
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingFormulaMapper.xml b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingFormulaMapper.xml
similarity index 67%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingFormulaMapper.xml
rename to common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingFormulaMapper.xml
index d70193b..f294e15 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingFormulaMapper.xml
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingFormulaMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="apelet.common.generator.dao.ReverseWritingFormulaMapper">
+<mapper namespace="apelet.common.botp.dao.ReverseWritingFormulaMapper">
 
 </mapper>
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingRulesMapper.xml b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingRulesMapper.xml
similarity index 84%
rename from common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingRulesMapper.xml
rename to common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingRulesMapper.xml
index 96ac458..310468c 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dao/mapper/ReverseWritingRulesMapper.xml
+++ b/common/common-botp/src/main/java/apelet/common/botp/dao/mapper/ReverseWritingRulesMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="apelet.common.generator.dao.ReverseWritingRulesMapper">
+<mapper namespace="apelet.common.botp.dao.ReverseWritingRulesMapper">
 
     <select id="getTableType" resultType="java.util.Map">
         SELECT cr.source_entity_id id ,fh.table_name name , fh.tableTxt
diff --git a/common/common-generator/src/main/java/apelet/common/generator/dto/ReverseWritingRulesDto.java b/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java
similarity index 66%
rename from common/common-generator/src/main/java/apelet/common/generator/dto/ReverseWritingRulesDto.java
rename to common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java
index 9867277..be1f4b5 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/dto/ReverseWritingRulesDto.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java
@@ -1,15 +1,16 @@
-package apelet.common.generator.dto;
+package apelet.common.botp.dto;
 
-import apelet.common.generator.model.ReverseWritingBusiness;
-import apelet.common.generator.model.ReverseWritingFormula;
-import apelet.common.generator.model.ReverseWritingRules;
+
+import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.model.ReverseWritingFormula;
+import apelet.common.botp.model.ReverseWritingRules;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class ReverseWritingRulesDto extends ReverseWritingRules  implements Serializable {
+public class ReverseWritingRulesDto extends ReverseWritingRules implements Serializable {
 
     /**
      * 来源单据名称
diff --git a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertFieldmappingEntry.java b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertFieldmappingEntry.java
index 16182eb..8d11ffa 100644
--- a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertFieldmappingEntry.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertFieldmappingEntry.java
@@ -65,6 +65,18 @@ public class ConvertFieldmappingEntry extends BaseModel {
     @Schema(description = "父表id")
     private String parentId;
 
+    @Excel(name = "合并方式", width = 15)
+    @Schema(description = "合并方式(1：直接取 2：求和 3：拼接)，默认为1")
+    private String mergeMethod;
+
+    @Excel(name = "目标分录", width = 15)
+    @Schema(description = "目标分录")
+    private String entryTarget;
+
+    @Excel(name = "执行顺序", width = 15)
+    @Schema(description = "执行顺序，数字越小越先执行")
+    private Integer serialNumber;
+
     @RelationGlobalDict(
             masterIdField = "parentId",
             dictCode = "parent_id")
diff --git a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRelation.java b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRelation.java
index b2aeec9..3f0544c 100644
--- a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRelation.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRelation.java
@@ -44,4 +44,7 @@ public class ConvertRelation extends BaseModel {
     @Schema(description = "目标单id")
     private String targetId;
 
+    @Excel(name = "`本次实际使用的规则版本", width = 15)
+    @Schema(description = "`本次实际使用的规则版本")
+    private Integer ruleVersion;
 }
diff --git a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
index 3c623fd..062ab83 100644
--- a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
@@ -158,6 +158,27 @@ public class ConvertRule extends BaseModel {
     @Schema(description = "下游在线编辑界面(关联在线表单界面（OnlineForm）)")
     private Long downEditInterface;
 
+    @Excel(name = "分单策略", width = 15)
+    @Schema(description = "分单策略(1：一对一 2：多对一 3：按规则分组合并)，默认为1")
+    private String splitMergeStrategy;
+
+
+    @Excel(name = "分单字段", width = 15)
+    @Schema(description = "分单字段")
+    private String groupByField;
+
+    @Excel(name = "规则启用条件", width = 15)
+    @Schema(description = "规则启用条件，,留空 = 始终启用")
+    private String enableConditionJson;
+
+    @Excel(name = "选单过滤条件", width = 15)
+    @Schema(description = "选单过滤策略，留空 = 全部通过")
+    private String selectFilterJson;
+
+    @Excel(name = "规则版本", width = 15)
+    @Schema(description = "规则版本")
+    private Integer ruleVersion;
+
     @RelationDict(
             masterIdField = "downEditInterface",
             equalOneToOneRelationField = "onlineForm",
diff --git a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingBusiness.java b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingBusiness.java
similarity index 97%
rename from common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingBusiness.java
rename to common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingBusiness.java
index b1d80e2..4719854 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingBusiness.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingBusiness.java
@@ -1,4 +1,4 @@
-package apelet.common.generator.model;
+package apelet.common.botp.model;
 
 import apelet.common.core.base.model.BaseModel;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingFormula.java b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingFormula.java
similarity index 92%
rename from common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingFormula.java
rename to common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingFormula.java
index c223da7..0e07b9a 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingFormula.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingFormula.java
@@ -1,4 +1,4 @@
-package apelet.common.generator.model;
+package apelet.common.botp.model;
 
 import apelet.common.core.base.model.BaseModel;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -74,4 +74,10 @@ public class ReverseWritingFormula extends BaseModel implements Serializable {
      */
     private int enable;
 
+    /**
+     * 执行顺序，数字越小越先执行
+     */
+    private Integer execOrder;
+
+
 }
diff --git a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingRules.java b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingRules.java
similarity index 66%
rename from common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingRules.java
rename to common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingRules.java
index 0e51444..910d4f9 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/model/ReverseWritingRules.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ReverseWritingRules.java
@@ -1,4 +1,4 @@
-package apelet.common.generator.model;
+package apelet.common.botp.model;
 
 import apelet.common.core.base.model.BaseModel;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -51,4 +51,28 @@ public class ReverseWritingRules extends BaseModel implements Serializable {
      */
     private int enable;
 
+    /**
+     * 超额检查公式，留空 = 不检查
+     */
+    private String excessCheckJson;
+
+    /**
+     * 超额动作 1：拦截报错 2：仅告警
+     */
+    private String excessAction;
+
+    /**
+     * 源单行关闭条件，留空=不关闭
+     */
+    private String sourceCloseJson;
+
+    /**
+     * 撤销回滚 1：是 0：否 默认是
+     */
+    private Integer rollbackOnRevoke;
+
+    /**
+     * 规则版本
+     */
+    private Integer ruleVersion;
 }
diff --git a/common/common-botp/src/main/java/apelet/common/botp/plugin/ReverseWritingPlugIn.java b/common/common-botp/src/main/java/apelet/common/botp/plugin/ReverseWritingPlugIn.java
index 18db7a1..a0eadfd 100644
--- a/common/common-botp/src/main/java/apelet/common/botp/plugin/ReverseWritingPlugIn.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/plugin/ReverseWritingPlugIn.java
@@ -4,10 +4,10 @@ import apelet.common.core.exception.MyRuntimeException;
 import apelet.common.core.object.ObjectCollection;
 import apelet.common.core.object.ObjectValue;
 import apelet.common.core.util.ApplicationContextHolder;
-import apelet.common.generator.dto.ReverseWritingRulesDto;
-import apelet.common.generator.model.ReverseWritingBusiness;
-import apelet.common.generator.model.ReverseWritingFormula;
-import apelet.common.generator.service.impl.ReverseWritingRulesServiceImpl;
+import apelet.common.botp.dto.ReverseWritingRulesDto;
+import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.model.ReverseWritingFormula;
+import apelet.common.botp.service.impl.ReverseWritingRulesServiceImpl;
 import apelet.common.generator.utils.OrmGenDataSourceUtil;
 import apelet.common.online.service.impl.OnlineFormServiceImpl;
 import apelet.common.online.util.Jexl3Util;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingBusinessService.java b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingBusinessService.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingBusinessService.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingBusinessService.java
index 7206b76..66e01c9 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingBusinessService.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingBusinessService.java
@@ -1,6 +1,6 @@
-package apelet.common.generator.service;
+package apelet.common.botp.service;
 
-import apelet.common.generator.model.ReverseWritingBusiness;
+import apelet.common.botp.model.ReverseWritingBusiness;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface IReverseWritingBusinessService extends IService<ReverseWritingBusiness> {
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingFormulaService.java b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingFormulaService.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingFormulaService.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingFormulaService.java
index bdc4070..b20a8f0 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingFormulaService.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingFormulaService.java
@@ -1,6 +1,6 @@
-package apelet.common.generator.service;
+package apelet.common.botp.service;
 
-import apelet.common.generator.model.ReverseWritingFormula;
+import apelet.common.botp.model.ReverseWritingFormula;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface IReverseWritingFormulaService extends IService<ReverseWritingFormula> {
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingRulesService.java b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingRulesService.java
similarity index 67%
rename from common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingRulesService.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingRulesService.java
index 7ab0c86..9525315 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/IReverseWritingRulesService.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/IReverseWritingRulesService.java
@@ -1,8 +1,8 @@
-package apelet.common.generator.service;
+package apelet.common.botp.service;
 
 
-import apelet.common.generator.dto.ReverseWritingRulesDto;
-import apelet.common.generator.model.ReverseWritingRules;
+import apelet.common.botp.dto.ReverseWritingRulesDto;
+import apelet.common.botp.model.ReverseWritingRules;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingBusinessServiceImpl.java b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingBusinessServiceImpl.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingBusinessServiceImpl.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingBusinessServiceImpl.java
index 5c87010..eda54da 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingBusinessServiceImpl.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingBusinessServiceImpl.java
@@ -1,8 +1,9 @@
-package apelet.common.generator.service.impl;
+package apelet.common.botp.service.impl;
 
-import apelet.common.generator.dao.ReverseWritingBusinessMapper;
-import apelet.common.generator.model.ReverseWritingBusiness;
-import apelet.common.generator.service.IReverseWritingBusinessService;
+
+import apelet.common.botp.dao.ReverseWritingBusinessMapper;
+import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.service.IReverseWritingBusinessService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingFormulaServiceImpl.java b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingFormulaServiceImpl.java
similarity index 60%
rename from common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingFormulaServiceImpl.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingFormulaServiceImpl.java
index 2d2e28d..89164c0 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingFormulaServiceImpl.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingFormulaServiceImpl.java
@@ -1,8 +1,9 @@
-package apelet.common.generator.service.impl;
+package apelet.common.botp.service.impl;
 
-import apelet.common.generator.dao.ReverseWritingFormulaMapper;
-import apelet.common.generator.model.ReverseWritingFormula;
-import apelet.common.generator.service.IReverseWritingFormulaService;
+
+import apelet.common.botp.dao.ReverseWritingFormulaMapper;
+import apelet.common.botp.model.ReverseWritingFormula;
+import apelet.common.botp.service.IReverseWritingFormulaService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingRulesServiceImpl.java b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java
similarity index 80%
rename from common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingRulesServiceImpl.java
rename to common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java
index ac73e97..f569208 100644
--- a/common/common-generator/src/main/java/apelet/common/generator/service/impl/ReverseWritingRulesServiceImpl.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java
@@ -1,13 +1,14 @@
-package apelet.common.generator.service.impl;
-
-import apelet.common.generator.dao.ReverseWritingRulesMapper;
-import apelet.common.generator.dto.ReverseWritingRulesDto;
-import apelet.common.generator.model.ReverseWritingBusiness;
-import apelet.common.generator.model.ReverseWritingFormula;
-import apelet.common.generator.model.ReverseWritingRules;
-import apelet.common.generator.service.IReverseWritingBusinessService;
-import apelet.common.generator.service.IReverseWritingFormulaService;
-import apelet.common.generator.service.IReverseWritingRulesService;
+package apelet.common.botp.service.impl;
+
+
+import apelet.common.botp.dao.ReverseWritingRulesMapper;
+import apelet.common.botp.dto.ReverseWritingRulesDto;
+import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.model.ReverseWritingFormula;
+import apelet.common.botp.model.ReverseWritingRules;
+import apelet.common.botp.service.IReverseWritingBusinessService;
+import apelet.common.botp.service.IReverseWritingFormulaService;
+import apelet.common.botp.service.IReverseWritingRulesService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
diff --git a/common/common-online/src/main/java/apelet/common/online/plugin/pre/AuditOperationServicePlugIn.java b/common/common-online/src/main/java/apelet/common/online/plugin/pre/AuditOperationServicePlugIn.java
index 0a3849e..6e4aa5c 100644
--- a/common/common-online/src/main/java/apelet/common/online/plugin/pre/AuditOperationServicePlugIn.java
+++ b/common/common-online/src/main/java/apelet/common/online/plugin/pre/AuditOperationServicePlugIn.java
@@ -1,26 +1,12 @@
 package apelet.common.online.plugin.pre;
 
-import apelet.common.core.exception.MyRuntimeException;
-import apelet.common.core.object.ObjectCollection;
-import apelet.common.core.object.ObjectValue;
 import apelet.common.core.util.ApplicationContextHolder;
-import apelet.common.generator.model.*;
-import apelet.common.generator.service.*;
-import apelet.common.generator.service.impl.ReverseWritingBusinessServiceImpl;
+import apelet.common.generator.service.IOnlFormHeadService;
 import apelet.common.generator.utils.OrmGenDataSourceUtil;
-import apelet.common.online.plugin.BeginOperationTransactionArgs;
 import apelet.common.online.plugin.OperationServicePlugIn;
 import apelet.common.online.plugin.OperationServicePlugInArgs;
-import apelet.common.online.service.OnlineFormService;
-import apelet.common.online.service.OnlineOperationService;
 import apelet.common.online.service.impl.OnlineFormServiceImpl;
 import apelet.common.online.util.Jexl3Util;
-import apelet.common.orm.impl.Selector;
-import apelet.common.orm.impl.SelectorItem;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import java.util.*;
 
 /**
  * @author Soon
@@ -30,9 +16,9 @@ import java.util.*;
 public class AuditOperationServicePlugIn extends OperationServicePlugIn {
 
     private OnlineFormServiceImpl onlineFormService;
-    private IReverseWritingRulesService reverseWritingRulesService;
-    private IReverseWritingBusinessService businessService;
-    private IReverseWritingFormulaService formulaService;
+//    private IReverseWritingRulesService reverseWritingRulesService;
+//    private IReverseWritingBusinessService businessService;
+//    private IReverseWritingFormulaService formulaService;
     private OrmGenDataSourceUtil ormGenDataSourceUtil;
     private IOnlFormHeadService onlFormHeadService;
     private Jexl3Util jexl3Util;
@@ -40,9 +26,9 @@ public class AuditOperationServicePlugIn extends OperationServicePlugIn {
 
     public AuditOperationServicePlugIn() {
         onlineFormService = ApplicationContextHolder.getBean("onlineFormService");
-        reverseWritingRulesService = ApplicationContextHolder.getBean("reverseWritingRulesServiceImpl");
-        businessService = ApplicationContextHolder.getBean("reverseWritingBusinessServiceImpl");
-        formulaService = ApplicationContextHolder.getBean("reverseWritingFormulaServiceImpl");
+//        reverseWritingRulesService = ApplicationContextHolder.getBean("reverseWritingRulesServiceImpl");
+//        businessService = ApplicationContextHolder.getBean("reverseWritingBusinessServiceImpl");
+//        formulaService = ApplicationContextHolder.getBean("reverseWritingFormulaServiceImpl");
         ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil");
         onlFormHeadService = ApplicationContextHolder.getBean("onlFormHeadServiceImpl");
         jexl3Util = ApplicationContextHolder.getBean("jexl3Util");
@@ -55,103 +41,103 @@ public class AuditOperationServicePlugIn extends OperationServicePlugIn {
         e.addFiledKey("billstatus");
     }
 
-    @Override
-    public void beginOperationTransaction(BeginOperationTransactionArgs e) {
-
-        ObjectValue objectValue = e.getModel();
-        if (!objectValue.get("billstatus").equals("B")) {
-            throw new RuntimeException("只有提交状态才能审核");
-        }
-        try {
-            objectValue.put("billstatus", "C");
-            Selector selector = new Selector();
-            selector.getList().add(new SelectorItem("billstatus"));
-            ormGenDataSourceUtil().update(objectValue.getTableName(), objectValue, selector);
-
-            OnlFormHead onlFormHead = onlFormHeadService.getOne(new LambdaQueryWrapper<OnlFormHead>().eq(OnlFormHead::getTableName, objectValue.getTableName()));
-            List<ReverseWritingRules> list = reverseWritingRulesService.list(
-                    new LambdaQueryWrapper<ReverseWritingRules>()
-                            .eq(ReverseWritingRules::getTargetDoc, onlFormHead.getId())
-                            .eq(ReverseWritingRules::getTriggerTiming, 2)
-                            .eq(ReverseWritingRules::getEnable, 1)
-            );
-            if (list.isEmpty()) {
-                return;
-            }
-            objectValue = ormGenDataSourceUtil.queryOne(objectValue.getTableName(), objectValue.getLong("id"));
-
-
-            for (ReverseWritingRules rules : list) {
-                List<ReverseWritingBusiness> businesses = businessService.list(
-                        new LambdaQueryWrapper<ReverseWritingBusiness>()
-                                .eq(ReverseWritingBusiness::getRulesId, rules.getId())
-                                .eq(ReverseWritingBusiness::getEnable, 1)
-                );
-                List<ReverseWritingFormula> formulaList = formulaService.list(
-                        new LambdaQueryWrapper<ReverseWritingFormula>()
-                                .eq(ReverseWritingFormula::getRulesId, rules.getId())
-                                .eq(ReverseWritingFormula::getEnable, 1)
-                );
-                OnlFormHead srcForm = onlFormHeadService.getOne(
-                        new LambdaQueryWrapper<OnlFormHead>().eq(OnlFormHead::getId, rules.getSourceDocuments())
-                );
-                if (objectValue.getValues().containsKey("srcbillid")) {
-
-                } else {
-                    Map map = objectValue.getValues();
-                    for (Object key : map.keySet()) {
-                        if (map.get(key) instanceof ObjectCollection) {
-                            ObjectCollection entryList = (ObjectCollection) map.get(key);
-                            Iterator iterator = entryList.iterator();
-                            while (iterator.hasNext()) {
-                                ObjectValue next = (ObjectValue) iterator.next();
-                                if (next.containsKey("srcbillid")) {
-                                    ObjectValue srcObjectValue = ormGenDataSourceUtil.queryOne(srcForm.getTableName(), next.getLong("srcbillid"));
-                                    ObjectValue finalObjectValue = objectValue;
-                                    businesses.forEach(b -> {
-                                        try {
-                                            boolean bool = (boolean) onlineFormService.func(b.getPreconditionsEnglish(), JSON.parseObject(b.getPreconditionsJson()), finalObjectValue);
-                                            String expressionTransl = bool ? b.getEstablishedEnglish() : b.getNotEstablishedEnglish();
-                                            String jsonObj = bool ? b.getEstablishedJson() : b.getNotEstablishedJson();
-                                            List<String> split = Arrays.asList(expressionTransl.split("="));
-                                            String fun = "";
-                                            for (String s : split) {
-                                                s = s.trim();
-                                                if (s.startsWith("$") && s.endsWith("$")) {
-                                                    fun = s;
-                                                }
-                                            }
-                                            fun = jexl3Util.getMySplit("\\$(.*?)\\$", fun);
-                                            List<String> funParam = Arrays.asList(jexl3Util.getMySplit("\\((.*?)\\)", fun).split(","));
-                                            Object[] objects = jexl3Util.getFunParam(funParam, finalObjectValue);
-                                            Object o = onlineFormService.executeFunction(JSON.parseObject(jsonObj), fun, objects);
-                                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
-                                        } catch (Exception ex) {
-                                            throw new RuntimeException(ex);
-                                        }
-                                    });
-                                    formulaList.forEach(f -> {
-
-                                        try {
-                                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
-                                        } catch (Exception ex) {
-                                            throw new RuntimeException(ex);
-                                        }
-                                    });
-                                }
-                            }
-                        }
-                    }
-
-                }
-            }
-
-
-            // 审核反写规则
-
-        } catch (Exception e1) {
-            throw new MyRuntimeException(e1);
-        }
-
-    }
+//    @Override
+//    public void beginOperationTransaction(BeginOperationTransactionArgs e) {
+//
+//        ObjectValue objectValue = e.getModel();
+//        if (!objectValue.get("billstatus").equals("B")) {
+//            throw new RuntimeException("只有提交状态才能审核");
+//        }
+//        try {
+//            objectValue.put("billstatus", "C");
+//            Selector selector = new Selector();
+//            selector.getList().add(new SelectorItem("billstatus"));
+//            ormGenDataSourceUtil().update(objectValue.getTableName(), objectValue, selector);
+//
+//            OnlFormHead onlFormHead = onlFormHeadService.getOne(new LambdaQueryWrapper<OnlFormHead>().eq(OnlFormHead::getTableName, objectValue.getTableName()));
+//            List<ReverseWritingRules> list = reverseWritingRulesService.list(
+//                    new LambdaQueryWrapper<ReverseWritingRules>()
+//                            .eq(ReverseWritingRules::getTargetDoc, onlFormHead.getId())
+//                            .eq(ReverseWritingRules::getTriggerTiming, 2)
+//                            .eq(ReverseWritingRules::getEnable, 1)
+//            );
+//            if (list.isEmpty()) {
+//                return;
+//            }
+//            objectValue = ormGenDataSourceUtil.queryOne(objectValue.getTableName(), objectValue.getLong("id"));
+//
+//
+//            for (ReverseWritingRules rules : list) {
+//                List<ReverseWritingBusiness> businesses = businessService.list(
+//                        new LambdaQueryWrapper<ReverseWritingBusiness>()
+//                                .eq(ReverseWritingBusiness::getRulesId, rules.getId())
+//                                .eq(ReverseWritingBusiness::getEnable, 1)
+//                );
+//                List<ReverseWritingFormula> formulaList = formulaService.list(
+//                        new LambdaQueryWrapper<ReverseWritingFormula>()
+//                                .eq(ReverseWritingFormula::getRulesId, rules.getId())
+//                                .eq(ReverseWritingFormula::getEnable, 1)
+//                );
+//                OnlFormHead srcForm = onlFormHeadService.getOne(
+//                        new LambdaQueryWrapper<OnlFormHead>().eq(OnlFormHead::getId, rules.getSourceDocuments())
+//                );
+//                if (objectValue.getValues().containsKey("srcbillid")) {
+//
+//                } else {
+//                    Map map = objectValue.getValues();
+//                    for (Object key : map.keySet()) {
+//                        if (map.get(key) instanceof ObjectCollection) {
+//                            ObjectCollection entryList = (ObjectCollection) map.get(key);
+//                            Iterator iterator = entryList.iterator();
+//                            while (iterator.hasNext()) {
+//                                ObjectValue next = (ObjectValue) iterator.next();
+//                                if (next.containsKey("srcbillid")) {
+//                                    ObjectValue srcObjectValue = ormGenDataSourceUtil.queryOne(srcForm.getTableName(), next.getLong("srcbillid"));
+//                                    ObjectValue finalObjectValue = objectValue;
+//                                    businesses.forEach(b -> {
+//                                        try {
+//                                            boolean bool = (boolean) onlineFormService.func(b.getPreconditionsEnglish(), JSON.parseObject(b.getPreconditionsJson()), finalObjectValue);
+//                                            String expressionTransl = bool ? b.getEstablishedEnglish() : b.getNotEstablishedEnglish();
+//                                            String jsonObj = bool ? b.getEstablishedJson() : b.getNotEstablishedJson();
+//                                            List<String> split = Arrays.asList(expressionTransl.split("="));
+//                                            String fun = "";
+//                                            for (String s : split) {
+//                                                s = s.trim();
+//                                                if (s.startsWith("$") && s.endsWith("$")) {
+//                                                    fun = s;
+//                                                }
+//                                            }
+//                                            fun = jexl3Util.getMySplit("\\$(.*?)\\$", fun);
+//                                            List<String> funParam = Arrays.asList(jexl3Util.getMySplit("\\((.*?)\\)", fun).split(","));
+//                                            Object[] objects = jexl3Util.getFunParam(funParam, finalObjectValue);
+//                                            Object o = onlineFormService.executeFunction(JSON.parseObject(jsonObj), fun, objects);
+//                                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
+//                                        } catch (Exception ex) {
+//                                            throw new RuntimeException(ex);
+//                                        }
+//                                    });
+//                                    formulaList.forEach(f -> {
+//
+//                                        try {
+//                                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
+//                                        } catch (Exception ex) {
+//                                            throw new RuntimeException(ex);
+//                                        }
+//                                    });
+//                                }
+//                            }
+//                        }
+//                    }
+//
+//                }
+//            }
+//
+//
+//            // 审核反写规则
+//
+//        } catch (Exception e1) {
+//            throw new MyRuntimeException(e1);
+//        }
+//
+//    }
 }
diff --git a/common/common-online/src/main/java/apelet/common/online/plugin/pre/RevokeOperationServicePlugIn.java b/common/common-online/src/main/java/apelet/common/online/plugin/pre/RevokeOperationServicePlugIn.java
index 99db64c..9161086 100644
--- a/common/common-online/src/main/java/apelet/common/online/plugin/pre/RevokeOperationServicePlugIn.java
+++ b/common/common-online/src/main/java/apelet/common/online/plugin/pre/RevokeOperationServicePlugIn.java
@@ -10,9 +10,9 @@ import apelet.common.flow.model.FlowWorkOrder;
 import apelet.common.flow.service.FlowApiService;
 import apelet.common.generator.model.OnlFormHead;
 import apelet.common.generator.service.IOnlFormHeadService;
-import apelet.common.generator.service.IReverseWritingBusinessService;
-import apelet.common.generator.service.IReverseWritingFormulaService;
-import apelet.common.generator.service.IReverseWritingRulesService;
+//import apelet.common.generator.service.IReverseWritingBusinessService;
+//import apelet.common.generator.service.IReverseWritingFormulaService;
+//import apelet.common.generator.service.IReverseWritingRulesService;
 import apelet.common.generator.utils.OrmGenDataSourceUtil;
 import apelet.common.online.plugin.BeginOperationTransactionArgs;
 import apelet.common.online.plugin.OperationServicePlugIn;
@@ -31,9 +31,9 @@ import java.util.HashMap;
  */
 public class RevokeOperationServicePlugIn extends OperationServicePlugIn {
 
-    private IReverseWritingRulesService reverseWritingRulesService;
-    private IReverseWritingBusinessService businessService;
-    private IReverseWritingFormulaService formulaService;
+//    private IReverseWritingRulesService reverseWritingRulesService;
+//    private IReverseWritingBusinessService businessService;
+//    private IReverseWritingFormulaService formulaService;
     private OnlineFormServiceImpl onlineFormService;
     private OrmGenDataSourceUtil ormGenDataSourceUtil;
     private IOnlFormHeadService onlFormHeadService;
diff --git a/common/common-online/src/main/java/apelet/common/online/plugin/pre/SaveOperationServicePlugIn.java b/common/common-online/src/main/java/apelet/common/online/plugin/pre/SaveOperationServicePlugIn.java
index a185357..08a3285 100644
--- a/common/common-online/src/main/java/apelet/common/online/plugin/pre/SaveOperationServicePlugIn.java
+++ b/common/common-online/src/main/java/apelet/common/online/plugin/pre/SaveOperationServicePlugIn.java
@@ -50,18 +50,18 @@ public class SaveOperationServicePlugIn extends OperationServicePlugIn {
 
     private CommonRedisUtil commonRedisUtil;
 
-    private IReverseWritingRulesService reverseWritingRulesService;
-    private IReverseWritingBusinessService businessService;
-    private IReverseWritingFormulaService formulaService;
+//    private IReverseWritingRulesService reverseWritingRulesService;
+//    private IReverseWritingBusinessService businessService;
+//    private IReverseWritingFormulaService formulaService;
 
 
     public SaveOperationServicePlugIn() {
         ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil");
         onlFormHeadService = ApplicationContextHolder.getBean("onlFormHeadServiceImpl");
         onlineFormService = ApplicationContextHolder.getBean("onlineFormService");
-        reverseWritingRulesService = ApplicationContextHolder.getBean("reverseWritingRulesServiceImpl");
-        businessService = ApplicationContextHolder.getBean("reverseWritingBusinessServiceImpl");
-        formulaService = ApplicationContextHolder.getBean("reverseWritingFormulaServiceImpl");
+//        reverseWritingRulesService = ApplicationContextHolder.getBean("reverseWritingRulesServiceImpl");
+//        businessService = ApplicationContextHolder.getBean("reverseWritingBusinessServiceImpl");
+//        formulaService = ApplicationContextHolder.getBean("reverseWritingFormulaServiceImpl");
         jexl3Util = ApplicationContextHolder.getBean("jexl3Util");
         commonRedisUtil = ApplicationContextHolder.getBean("commonRedisUtil");
         onlineTableService = ApplicationContextHolder.getBean("onlineTableService");
@@ -121,109 +121,109 @@ public class SaveOperationServicePlugIn extends OperationServicePlugIn {
             //objectValue.put("create_user_id", jsonObject);
             objectValue = ormGenDataSourceUtil.addNew(objectValue.getTableName(), objectValue);
         }
-        reverseWriting(objectValue, onlFormHead);
+//        reverseWriting(objectValue, onlFormHead);
         return objectValue;
     }
 
 
     // 反写规则
-    void reverseWriting(ObjectValue objectValue, OnlFormHead onlFormHead) {
-        // 判断是否存在源单单据ID
-        if (StringUtils.isEmpty(objectValue.getString("srcbillid"))) {
-            return;
-        }
-        // 反写规则
-        List<ReverseWritingRules> rules = reverseWritingRulesService.list(
-                new LambdaQueryWrapper<ReverseWritingRules>()
-                        .eq(ReverseWritingRules::getEnable, 1)
-                        .eq(ReverseWritingRules::getTriggerTiming, 1)
-                        .eq(ReverseWritingRules::getTargetDoc, onlFormHead.getId()));
-        ObjectValue finalObjectValue = objectValue;
-        rules.forEach(rule -> {
-            // 反写公式
-            List<ReverseWritingFormula> formulaList = formulaService.list(
-                    new LambdaQueryWrapper<ReverseWritingFormula>()
-                            .eq(ReverseWritingFormula::getEnable, 1)
-                            .eq(ReverseWritingFormula::getRulesId, rule.getId()));
-            for (ReverseWritingFormula formula : formulaList) {
-                if (formula.getEnable() == 0) continue;
-                JSONObject conditionJson = JSON.parseObject(formula.getConditionJson());
-                String expressionTranslation = conditionJson.getString("expressionTranslation");
-                boolean funValue = (Boolean) onlineFormService.func(expressionTranslation, conditionJson, finalObjectValue);
-                if (funValue) {
-                    String sourceSingleField = formula.getSourceSingleField();
-                    String formulaField = formula.getFormulaEnglish();
-                    String[] s = sourceSingleField.split("\\.");  // 上游单据
-                    String[] f = formulaField.split("\\."); // 下游单据
-                    if (s[0].equals(s[1])) {
-                        //修改表头
-                        ObjectValue srcObjectValue = new ObjectValue(s[1]);
-                        srcObjectValue.put("id", finalObjectValue.getLong("srcbillid"));
-                        srcObjectValue.put(s[2], finalObjectValue.get(s[2]));
-                        try {
-                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        }
-                    } else {
-                        //修改分录
-                        ObjectCollection collection = (ObjectCollection) finalObjectValue.get(f[1]);
-                        Iterator iterator = collection.iterator();
-                        while (iterator.hasNext()) {
-                            ObjectValue next = (ObjectValue) iterator.next();
-                            Object value = getValue(formula.getFormulaJson(), next);
-                            // 反写原单据
-                            ObjectValue srcObjectValue = new ObjectValue(s[1]);
-                            srcObjectValue.put("id", next.getLong("srcbillentryid"));
-                            srcObjectValue.put(s[2], value);
-                            try {
-                                ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
-                            } catch (Exception e) {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-            // 业务规则
-            List<ReverseWritingBusiness> businessList = businessService.list(
-                    new LambdaQueryWrapper<ReverseWritingBusiness>()
-                            .eq(ReverseWritingBusiness::getEnable, 1)
-                            .eq(ReverseWritingBusiness::getRulesId, rule.getId()));
-            for (ReverseWritingBusiness business : businessList) {
-                if (business.getEnable() == 0) continue;
-                String preconditionsEnglish = business.getPreconditionsEnglish();
-                JSONObject jsonObject = JSONObject.parseObject(business.getPreconditionsJson());
-                boolean p = (Boolean) onlineFormService.func(preconditionsEnglish, jsonObject, finalObjectValue);
-                String expression;
-                JSONObject expressionJson;
-                if (p) {
-                    expression = business.getEstablishedEnglish();
-                    expressionJson = JSON.parseObject(business.getEstablishedJson());
-                } else {
-                    expression = business.getNotEstablishedEnglish();
-                    expressionJson = JSON.parseObject(business.getNotEstablishedJson());
-                }
-                List<String> split = Arrays.asList(expression.split("="));
-                String fun = "";
-                String tableName = "";
-                for (String s : split) {
-                    s = s.trim();
-                    tableName = s.split("\\.")[0];
-                    if (s.startsWith("$") && s.endsWith("$")) {
-                        fun = s;
-                    }
-                }
-                ObjectValue srcObjectValue = ormGenDataSourceUtil.queryOne(tableName, objectValue.getLong("srcbillid"), null);
-                fun = jexl3Util.getMySplit("\\$(.*?)\\$", fun);
-                List<String> funParam = Arrays.asList(jexl3Util.getMySplit("\\((.*?)\\)", fun).split(","));
-                Object[] objects = jexl3Util.getFunParam(funParam, srcObjectValue);
-                Object o = onlineFormService.executeFunction(expressionJson, fun, objects);
-                System.out.println(o);
-            }
-
-        });
-    }
+//    void reverseWriting(ObjectValue objectValue, OnlFormHead onlFormHead) {
+//        // 判断是否存在源单单据ID
+//        if (StringUtils.isEmpty(objectValue.getString("srcbillid"))) {
+//            return;
+//        }
+//        // 反写规则
+//        List<ReverseWritingRules> rules = reverseWritingRulesService.list(
+//                new LambdaQueryWrapper<ReverseWritingRules>()
+//                        .eq(ReverseWritingRules::getEnable, 1)
+//                        .eq(ReverseWritingRules::getTriggerTiming, 1)
+//                        .eq(ReverseWritingRules::getTargetDoc, onlFormHead.getId()));
+//        ObjectValue finalObjectValue = objectValue;
+//        rules.forEach(rule -> {
+//            // 反写公式
+//            List<ReverseWritingFormula> formulaList = formulaService.list(
+//                    new LambdaQueryWrapper<ReverseWritingFormula>()
+//                            .eq(ReverseWritingFormula::getEnable, 1)
+//                            .eq(ReverseWritingFormula::getRulesId, rule.getId()));
+//            for (ReverseWritingFormula formula : formulaList) {
+//                if (formula.getEnable() == 0) continue;
+//                JSONObject conditionJson = JSON.parseObject(formula.getConditionJson());
+//                String expressionTranslation = conditionJson.getString("expressionTranslation");
+//                boolean funValue = (Boolean) onlineFormService.func(expressionTranslation, conditionJson, finalObjectValue);
+//                if (funValue) {
+//                    String sourceSingleField = formula.getSourceSingleField();
+//                    String formulaField = formula.getFormulaEnglish();
+//                    String[] s = sourceSingleField.split("\\.");  // 上游单据
+//                    String[] f = formulaField.split("\\."); // 下游单据
+//                    if (s[0].equals(s[1])) {
+//                        //修改表头
+//                        ObjectValue srcObjectValue = new ObjectValue(s[1]);
+//                        srcObjectValue.put("id", finalObjectValue.getLong("srcbillid"));
+//                        srcObjectValue.put(s[2], finalObjectValue.get(s[2]));
+//                        try {
+//                            ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
+//                        } catch (Exception e) {
+//                            throw new RuntimeException(e);
+//                        }
+//                    } else {
+//                        //修改分录
+//                        ObjectCollection collection = (ObjectCollection) finalObjectValue.get(f[1]);
+//                        Iterator iterator = collection.iterator();
+//                        while (iterator.hasNext()) {
+//                            ObjectValue next = (ObjectValue) iterator.next();
+//                            Object value = getValue(formula.getFormulaJson(), next);
+//                            // 反写原单据
+//                            ObjectValue srcObjectValue = new ObjectValue(s[1]);
+//                            srcObjectValue.put("id", next.getLong("srcbillentryid"));
+//                            srcObjectValue.put(s[2], value);
+//                            try {
+//                                ormGenDataSourceUtil.update(srcObjectValue.getTableName(), srcObjectValue, null);
+//                            } catch (Exception e) {
+//                                throw new RuntimeException(e);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            // 业务规则
+//            List<ReverseWritingBusiness> businessList = businessService.list(
+//                    new LambdaQueryWrapper<ReverseWritingBusiness>()
+//                            .eq(ReverseWritingBusiness::getEnable, 1)
+//                            .eq(ReverseWritingBusiness::getRulesId, rule.getId()));
+//            for (ReverseWritingBusiness business : businessList) {
+//                if (business.getEnable() == 0) continue;
+//                String preconditionsEnglish = business.getPreconditionsEnglish();
+//                JSONObject jsonObject = JSONObject.parseObject(business.getPreconditionsJson());
+//                boolean p = (Boolean) onlineFormService.func(preconditionsEnglish, jsonObject, finalObjectValue);
+//                String expression;
+//                JSONObject expressionJson;
+//                if (p) {
+//                    expression = business.getEstablishedEnglish();
+//                    expressionJson = JSON.parseObject(business.getEstablishedJson());
+//                } else {
+//                    expression = business.getNotEstablishedEnglish();
+//                    expressionJson = JSON.parseObject(business.getNotEstablishedJson());
+//                }
+//                List<String> split = Arrays.asList(expression.split("="));
+//                String fun = "";
+//                String tableName = "";
+//                for (String s : split) {
+//                    s = s.trim();
+//                    tableName = s.split("\\.")[0];
+//                    if (s.startsWith("$") && s.endsWith("$")) {
+//                        fun = s;
+//                    }
+//                }
+//                ObjectValue srcObjectValue = ormGenDataSourceUtil.queryOne(tableName, objectValue.getLong("srcbillid"), null);
+//                fun = jexl3Util.getMySplit("\\$(.*?)\\$", fun);
+//                List<String> funParam = Arrays.asList(jexl3Util.getMySplit("\\((.*?)\\)", fun).split(","));
+//                Object[] objects = jexl3Util.getFunParam(funParam, srcObjectValue);
+//                Object o = onlineFormService.executeFunction(expressionJson, fun, objects);
+//                System.out.println(o);
+//            }
+//
+//        });
+//    }
 
     Object getValue(String json, ObjectValue objectValue) {
         // 计算反写公式
diff --git a/common/pom.xml b/common/pom.xml
index d79f21d..a698271 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -15,6 +15,7 @@
         <module>common-flow</module>
         <module>common-flow-online</module>
         <module>common-online</module>
+        <module>common-botp</module>
 
         <module>common-tenant</module>
         <module>common-tenant-online</module>
-- 
2.9.0.windows.1