diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/AccountMoveLineJobTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/AccountMoveLineJobTest.java new file mode 100644 index 0000000..dc0be8a --- /dev/null +++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/AccountMoveLineJobTest.java @@ -0,0 +1,21 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.quartz.task.odoo.AccountMoveLineJob; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@Slf4j +class AccountMoveLineJobTest { + @Autowired + private AccountMoveLineJob accountMoveLineJob; + + @Test + void execute() { + + accountMoveLineJob.execute(null); + + } +} diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct6JobTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct6JobTest.java new file mode 100644 index 0000000..e44cf37 --- /dev/null +++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct6JobTest.java @@ -0,0 +1,22 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.quartz.task.odoo.ProductProductJob; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@Slf4j +class ProductProduct6JobTest { + + @Autowired + private ProductProductJob productProductJob; + + @Test + void execute() { + + productProductJob.execute(6); + + } +} diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct8JobTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct8JobTest.java new file mode 100644 index 0000000..0019607 --- /dev/null +++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProduct8JobTest.java @@ -0,0 +1,22 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.quartz.task.odoo.ProductProductJob; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@Slf4j +class ProductProduct8JobTest { + + @Autowired + private ProductProductJob productProductJob; + + @Test + void execute() { + + productProductJob.execute(8); + + } +} diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProductJobTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProductJobTest.java new file mode 100644 index 0000000..7e03e7b --- /dev/null +++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/ProductProductJobTest.java @@ -0,0 +1,22 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.quartz.task.odoo.ProductProductJob; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@Slf4j +class ProductProductJobTest { + + @Autowired + private ProductProductJob productProductJob; + + @Test + void execute() { + + productProductJob.execute(1); + + } +} 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 d92cc92..7bd9d1c 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 @@ -41,11 +41,10 @@ public class AccountMoveLineJob extends OdooAbstrackob { String date = DateUtils.ldt2str(LocalDateTime.now(), DateUtils.YYYY_MM_DD); return Arrays.asList(Arrays.asList( Arrays.asList("parent_state", "=", "posted") - , Arrays.asList("account_id", "in","1018,107,1189") - ,Arrays.asList("create_date", ">=", date) + , Arrays.asList("account_id", "in", Arrays.asList(1018,107,1189)) + ,Arrays.asList("create_date", ">=", "2022-01-01") )); } - @Override protected Map> getQueryFieldMap(Integer warehouseId) { // return new HashMap() {{ 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 7ed0ddf..a8bf2e8 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 @@ -57,9 +57,11 @@ public abstract class OdooAbstrackob { @Value("${sync.flag}") private Boolean syncFlag; - private static final String GET_DATA_DB = "Fortune_test0716"; +// private static final String GET_DATA_DB = "Fortune_test0716"; + private static final String GET_DATA_DB = "Fortune"; private static final String GET_DATA_NAME = "test"; - private static final String GET_DATA_PASSWORD = "00cc06962c4583e562f7f3fcad2f38ef840e1d02"; + private static final String GET_DATA_PASSWORD = "test"; +// private static final String GET_DATA_PASSWORD = "00cc06962c4583e562f7f3fcad2f38ef840e1d02"; private static final String GET_DATA_P_METHOD_NAME = "execute_kw"; private static final String INIT_URL = "http://47.115.191.117:8869"; 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 39ea81b..d565cb7 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 @@ -51,9 +51,9 @@ public class ProductProductJob extends OdooAbstrackob { // , "qty_available", "incoming_qty","cost","categ_id.name", "packaging_ids")); // }}; return new HashMap() {{ - put("fields", Arrays.asList("id","default_code", "name", "description_purchase" - , "qty_available", "incoming_qty", "packaging_ids", "standard_price", "categ_id")); - put("context", MapUtil.of("warehouse",String.valueOf(warehouseId))); + put("fields", Arrays.asList("id", "default_code", "name", "description_purchase" + , "qty_available", "incoming_qty", "packaging_ids", "standard_price", "free_qty", "categ_id")); + put("context", MapUtil.of("warehouse_id",String.valueOf(warehouseId))); }}; }