diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/AccountMoveLineJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/AccountMoveLineJob.java index 56ffd54..9b6185b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/AccountMoveLineJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/AccountMoveLineJob.java @@ -2,9 +2,11 @@ package com.ruoyi.quartz.task.odoo; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.enums.TableRelationTypeEnum; +import com.ruoyi.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -28,20 +30,29 @@ public class AccountMoveLineJob extends OdooAbstrackob { return "account.move.line"; } + @Override + public void execute() { + super.execute(); + } + @Override protected List getQueryConditionList() { + String date = DateUtils.ldt2str(LocalDateTime.now(), DateUtils.YYYY_MM_DD); return Arrays.asList(Arrays.asList( - Arrays.asList("parent_state", "=", "posted"), - Arrays.asList("account_id", "=", 1018) -// asList("Date", ">", 2022-01-01) + Arrays.asList("parent_state", "=", "posted") + , Arrays.asList("account_id", "=", 1018) +// ,Arrays.asList("Date", ">", 2023-07-27) )); } @Override protected Map> getQueryFieldMap() { +// return new HashMap() {{ +// put("fields", Arrays.asList("id","partner_id.name", "date", "product_id.default_code" +// , "quantity", "unit_price", "company_id.display_name","product_id.categ_id.name")); +// }}; return new HashMap() {{ - put("fields", Arrays.asList("id","partner_id.name", "date", "product_id.default_code" - , "quantity", "unit_price", "company_id.display_name","product_id.categ_id.name")); + put("fields", Arrays.asList("id", "date", "quantity")); }}; } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductPackingJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductPackingJob.java index 75e8825..42ca1a4 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductPackingJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductPackingJob.java @@ -28,6 +28,11 @@ public class ProductPackingJob extends OdooAbstrackob { return "product.packaging"; } + @Override + public void execute() { + super.execute(); + } + @Override protected List getQueryConditionList() { return Arrays.asList( 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 b334fb6..33315db 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 @@ -28,6 +28,11 @@ public class ProductProductJob extends OdooAbstrackob { return "product.product"; } + @Override + public void execute() { + super.execute(); + } + @Override protected List getQueryConditionList() { return Arrays.asList( diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductShukikuJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductShukikuJob.java index afd4c39..1e7dbc5 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductShukikuJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/ProductShukikuJob.java @@ -28,6 +28,11 @@ public class ProductShukikuJob extends OdooAbstrackob { return "product.product.shukiku"; } + @Override + public void execute() { + super.execute(); + } + @Override protected List getQueryConditionList() { return Arrays.asList( diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/StockQuantJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/StockQuantJob.java index fd3a42b..7f101e7 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/StockQuantJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/StockQuantJob.java @@ -20,19 +20,25 @@ public class StockQuantJob extends OdooAbstrackob { @Override protected String buildUniqueKey(JSONObject body) { - return body.getString("default_code"); + return body.getString("id"); } @Override protected String getQueryModelName() { - return "stock_quant"; + return "product.product"; + } + + @Override + public void execute() { + super.execute(); } @Override protected List getQueryConditionList() { return Arrays.asList( Arrays.asList( - Arrays.asList("active", "=", true) + Arrays.asList("active", "=", true), + Arrays.asList("company_id", "in", Arrays.asList(1, 3, 5)) ) ); } @@ -40,17 +46,18 @@ public class StockQuantJob extends OdooAbstrackob { @Override protected Map> getQueryFieldMap() { return new HashMap() {{ - put("fields", Arrays.asList("default code", "FOFO stock", "incoming", "forsince stock")); + put("fields", Arrays.asList("free_qty","incoming_qty","virtual_available", "company_id", "id")); }}; } @Override protected Map buildLarkBodyMap(JSONObject date) { Map map = new HashMap<>(); - map.put("default code",date.getString("default code")); - map.put("FOFO stock",date.getString("FOFO stock")); - map.put("incoming",date.getString("incoming")); - map.put("forsince stock",date.getString("forsince stock")); + map.put("free_qty", date.getString("free_qty")); + map.put("incoming_qty", date.getString("incoming_qty")); + map.put("virtual_available", date.getString("virtual_available")); + map.put("company_id", date.getString("company_id")); + map.put("id", date.getString("id")); return map; }