From 8c26e8c17968885e0c7a067a7e32505f893e45d2 Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Thu, 3 Aug 2023 23:31:26 +0800
Subject: [PATCH] =?UTF-8?q?odoo=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java  | 9 +++++----
 .../com/ruoyi/quartz/task/odoo/ProductProductJob.java    | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java
index 450698b..2c0872a 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java
@@ -109,8 +109,8 @@ public abstract class OdooAbstrackob {
         LarkTableRelation tableRelation = context.getTableRelation();
         LarkTableRequest larkRequest = new LarkTableRequest(companyRelation.getAppId(), companyRelation.getSecret(), tableRelation.getToAppToken(), tableRelation.getToTableId());
         //待创建关联关系
-        List<ErpLarkRelation> waitCreateRelation = new ArrayList<>();
         do {
+            List<ErpLarkRelation> waitCreateRelation = new ArrayList<>();
             dateList = getDate(context, pageMap, errorList);
             List<JSONObject> midDateList = dateList.stream().map(r -> {
                 return (JSONObject)JSONObject.toJSON(r);
@@ -121,15 +121,16 @@ public abstract class OdooAbstrackob {
                     sync(jsonObject, errorList, relationMap, larkRequest,waitCreateRelation);
                 }
             }
+            if (CollectionUtils.isNotEmpty(waitCreateRelation)){
+                erpLarkRelationMapper.batchInsert(waitCreateRelation);
+            }
             pageMap.put(PAGE_OFFSET_KEY,pageMap.get(PAGE_OFFSET_KEY) + PAGE_SIZE);
         } while (dateList == null || (CollectionUtils.isNotEmpty(dateList) && dateList.size() == PAGE_SIZE));
         if (!CollectionUtils.isEmpty(errorList)) {
             String errorKey = String.join(",", errorList);
             throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
         }
-        if (CollectionUtils.isNotEmpty(waitCreateRelation)){
-            erpLarkRelationMapper.batchInsert(waitCreateRelation);
-        }
+
     }
 
     private void sync(JSONObject jsonObject, List<String> errorList
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductProductJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductProductJob.java
index 0e32a40..1126e8d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductProductJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductProductJob.java
@@ -50,7 +50,7 @@ public class ProductProductJob extends OdooAbstrackob {
 //        }};
         return new HashMap() {{
             put("fields", Arrays.asList("id","default_code", "name", "description_purchase"
-                    , "qty_available", "incoming_qty", "packaging_ids", "total_cost", "categ_id"));
+                    , "qty_available", "incoming_qty", "packaging_ids", "total_cost", "categ_id", "free_qty"));
         }};
     }
 
@@ -66,6 +66,7 @@ public class ProductProductJob extends OdooAbstrackob {
         map.put("packaging_ids",date.getString("packaging_ids"));
         map.put("total_cost",date.getString("total_cost"));
         map.put("categ_id",date.getString("categ_id"));
+        map.put("free_qty",date.getString("free_qty"));
         return map;
     }