From 6c4fd4446375a3e19cee85cae31877522153646e Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Sun, 15 Oct 2023 11:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5job=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E9=94=AE=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ErpLarkRelationMapper.java         |  2 +-
 .../mapper/ErpLarkRelationMapper.xml          |  2 +-
 .../task/CJT/ManufactureOrderSyncJob.java     |  1 +
 .../task/CJT/PurchaseArrivalOpenSyncJob.java  |  1 +
 .../quartz/task/CJT/PurchaseOrderSyncJob.java |  1 +
 .../quartz/task/CJT/SaleDeliverySyncJob.java  |  1 +
 .../quartz/task/CJT/SaleDispatchSyncJob.java  |  1 +
 .../quartz/task/CJT/SaleOrderSyncJob.java     |  1 +
 .../task/CJT/SyncAccountsJobAbstract.java     | 20 ++++++++++++-------
 9 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMapper.java
index e4ea5bf..9922cf0 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMapper.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMapper.java
@@ -65,7 +65,7 @@ public interface ErpLarkRelationMapper
 
 
     public List<ErpLarkRelation> queryListByKeyList(@Param("keyList") List<String> keyList,@Param("method") String method);
-    public List<ErpLarkRelation> queryListByKeyListAndRemark(@Param("keyList") List<String> keyList,@Param("method") String method,@Param("remark") String remark);
+    public List<ErpLarkRelation> queryListByKeyListAndRemark(@Param("keyList") List<String> keyList,@Param("method") String method,@Param("remark") String remark,@Param("tableId") String tableId);
     public List<String> queryWaitDeleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark);
     public void deleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark);
     /**
diff --git a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMapper.xml
index e978618..cd34398 100644
--- a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMapper.xml
+++ b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMapper.xml
@@ -54,7 +54,7 @@
     <select id="queryListByKeyListAndRemark" resultMap="ErpLarkRelationResult">
         select `key`, `method`,lark_key
         from erp_lark_relation
-        where `method` = #{method} and remark = #{remark} and `key` in
+        where `method` = #{method} and lark_table = #{tableId} and remark = #{remark} and `key` in
         <foreach collection="keyList" open="(" separator="," close=")" item="item">
             #{item}
         </foreach>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java
index 7755a1b..fa72454 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java
@@ -66,6 +66,7 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract {
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "ManufactureOrder.ID",
                 "ManufactureOrder.VoucherDate",
                 "ManufactureOrder.ManufactureOrderDetails.SourceVoucherCode",
                 "ManufactureOrder.Code",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java
index a1e4326..9b4c5db 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java
@@ -63,6 +63,7 @@ public class PurchaseArrivalOpenSyncJob extends SyncAccountsJobAbstract{
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "PurchaseArrival.ID",
                 "PurchaseArrival.PurchaseOrderCode",
                 "PurchaseArrival.Details.Inventory.Code",
                 "PurchaseArrival.Details.Inventory.Name",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java
index 25626ea..f0a6daf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java
@@ -53,6 +53,7 @@ public class PurchaseOrderSyncJob extends SyncAccountsJobAbstract{
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "PurchaseOrder.ID",
                 "PurchaseOrder.VoucherDate",
                 "PurchaseOrder.Code",
                 "PurchaseOrder.Partner.Name",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java
index 565842f..757d373 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java
@@ -69,6 +69,7 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract {
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "SaleDelivery.ID",
                 "SaleDelivery.Code",
                 "SaleDelivery.Customer.Name",
                 "SaleDelivery.BusinessType.Name",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java
index 37c9013..85b2070 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java
@@ -60,6 +60,7 @@ public class SaleDispatchSyncJob extends SyncAccountsJobAbstract{
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "RDRecord.Id",
                 "RDRecord.RDRecordDetails.SourceVoucherCode",
                 "RDRecord.VoucherDate",
                 "RDRecord.Code",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java
index 2a526da..9608459 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java
@@ -67,6 +67,7 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{
     @Override
     protected List<String> getQueryFields() {
         return Arrays.asList(
+                "SaleOrder.ID",
                 "SaleOrder.voucherdate",
                 "SaleOrder.code",
                 "SaleOrder.createdtime",
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
index 99e135a..7de003e 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
@@ -366,7 +366,6 @@ public abstract class SyncAccountsJobAbstract {
         List<List<String>> rows = new ArrayList<>();
         do {
             try {
-                TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
                 //初始化数据
                 if (cjtRequestBody == null) {
                     cjtRequestBody = new CJTRequestBody(page, PAGE_SIZE, getQueryFields(), getQueryCondition(context));
@@ -390,7 +389,6 @@ public abstract class SyncAccountsJobAbstract {
                         throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
                     }
                 }
-                dataSourceTransactionManager.commit(transactionStatus);
             } catch (Exception e) {
                 log.error("{} exception", this.getClassName(), e);
                 errorMessage = buildErrorBody(cjtRequest, e.getMessage());
@@ -415,7 +413,7 @@ public abstract class SyncAccountsJobAbstract {
                         midList.add(row.get(i));
                     }
                 }
-                String uniqueKey = String.join("_", midList).toUpperCase() + "_" + addRecordRequest.getAppTable();
+                String uniqueKey = String.join("_", midList).toUpperCase();
                 result.add(uniqueKey);
             }
         }
@@ -433,6 +431,7 @@ public abstract class SyncAccountsJobAbstract {
         if (CollectionUtils.isEmpty(uniqueKeyList)) {
             return new HashMap<>();
         }
+        //todo yxy 这里记得加上表id
         return erpLarkRelationMapper.queryListByKeyListAndRemark(uniqueKeyList, getRequestUrl(), cjt)
                 .stream().collect(Collectors.toMap(ErpLarkRelation::getKey, ErpLarkRelation::getLarkKey, (k1, k2) -> k1));
     }
@@ -474,6 +473,7 @@ public abstract class SyncAccountsJobAbstract {
             createTimeKey = "createdtime";
         }
         String createTime = null;
+        String voucherId = null;
         for (List<String> row : rows) {
             String uniqueKey = null;
             try {
@@ -482,9 +482,13 @@ public abstract class SyncAccountsJobAbstract {
                 for (int i = 0; i < row.size(); i++) {
                     String rowKey = keyList.get(i);
                     String value = row.get(i);
-                    if (createTimeKey.equals(rowKey.toLowerCase())){
+                    String lowerCaseRowKey = rowKey.toLowerCase();
+                    if (createTimeKey.equals(lowerCaseRowKey)){
                         createTime = value;
                     }
+                    if ("id".equals(lowerCaseRowKey)){
+                        voucherId = value;
+                    }
                     if (uniqueFields.contains(rowKey)) {
                         uniqueKeyList.add(value);
                     }
@@ -495,7 +499,7 @@ public abstract class SyncAccountsJobAbstract {
                     String larkLabel = cjtSyncTypeRelation.getLarkFileName();
                     body.put(larkLabel, this.changeValueType(value, cjtSyncTypeRelation));
                 }
-                uniqueKey = String.join("_", uniqueKeyList).toUpperCase() + "_" + addRecordRequest.getAppTable();
+                uniqueKey = String.join("_", uniqueKeyList).toUpperCase();
                 Boolean existFlag = redisCache.setCacheObjectIfAbsent("CJT_JOB_CACHE:"+uniqueKey, "1", 2L, TimeUnit.HOURS);
                 if (repeatMap.containsKey(uniqueKey) || !existFlag) {
                     continue;
@@ -507,7 +511,7 @@ public abstract class SyncAccountsJobAbstract {
                     //在飞书创建一行，并根据创建返回的行id在本地保留一条映射纪律
                     CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(addRecordRequest);
                     larkKey = respBody.getRecord().getRecordId();
-                    relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjt, asynchronous,createTime));
+                    relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjt, asynchronous,createTime,voucherId,addRecordRequest.getAppTable()));
                 } else {
                     if (!AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.equals(syncLarkAppType())) {
                         //根据本地保留映射，确认飞书的更新行，更新后防止影响后续更新，需要将行id进行置空
@@ -542,9 +546,11 @@ public abstract class SyncAccountsJobAbstract {
     }
 
     //构建飞书行与cjt唯一键的对应关系对象
-    private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt, Boolean asynchronous,String createTime) {
+    private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt, Boolean asynchronous,String createTime,String voucherID,String tableId) {
         ErpLarkRelation erpLarkRelation = new ErpLarkRelation();
         erpLarkRelation.setKey(key);
+        erpLarkRelation.setCjtId(voucherID);
+        erpLarkRelation.setLarkTable(tableId);
         erpLarkRelation.setLarkKey(larkKey);
         erpLarkRelation.setMethod(getRequestUrl());
         erpLarkRelation.setFlag(FlagStatus.OK.getCode());