From 48b8d721dd9621417df2c59a676d86286b6d8bfe Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Tue, 8 Aug 2023 22:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/CJT/ManufactureOrderSyncJob.java | 44 ++++++++++--------- .../quartz/task/CJT/SaleDeliverySyncJob.java | 12 ++--- .../quartz/task/CJT/SaleOrderSyncJob.java | 7 +-- .../task/CJT/SyncAccountsJobAbstract.java | 3 ++ 4 files changed, 36 insertions(+), 30 deletions(-) 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 adec075..4dcc10f 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 @@ -14,11 +14,12 @@ import java.util.Map; /** * 生产加工单 + * * @author yuxiangyong * @create 2023-07-17 21:21 */ @Component("manufactureOrderJob") -public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract{ +public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract { private static final String urlPath = "/tplus/api/v2/ManufactureOrderOpenApi/FindVoucherList"; @@ -34,8 +35,8 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract{ } @Override - public void executeSync(String cjt,String queryFromTime,String queryToTime) { - super.executeSync(cjt,queryFromTime,queryToTime); + public void executeSync(String cjt, String queryFromTime, String queryToTime) { + super.executeSync(cjt, queryFromTime, queryToTime); } @Override @@ -67,32 +68,33 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract{ "ManufactureOrder.ManufactureOrderDetails.Quantity", "ManufactureOrder.ManufactureOrderDetails.pubuserdefnvc2", "ManufactureOrder.Customer.Name", - "ManufactureOrder.ManufactureOrderDetails.priuserdefnvc1"); + "ManufactureOrder.ManufactureOrderDetails.priuserdefnvc1", + "ManufactureOrder.ManufactureOrderDetails.pubuserdefnvc1"); } @Override protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); map.put("VoucherDate", new CJTSyncTypeRelation("单据日期")); - map.put("manufactureorderdetails_sourcevouchercode",new CJTSyncTypeRelation("存货编码")); - map.put("Code",new CJTSyncTypeRelation("单据编码")); - map.put("CreatedTime",new CJTSyncTypeRelation("创建时间")); - map.put("Department_Name",new CJTSyncTypeRelation("生产车间")); - map.put("person_name",new CJTSyncTypeRelation("负责人")); - map.put("ManufactureOrderDetails_Inventory_Code",new CJTSyncTypeRelation("产品编码")); - map.put("ManufactureOrderDetails_Inventory_Name",new CJTSyncTypeRelation("产品")); - map.put("ManufactureOrderDetails_Inventory_Specification",new CJTSyncTypeRelation("规格型号")); - map.put("ManufactureOrderDetails_Unit_Name",new CJTSyncTypeRelation("生产单位")); - map.put("ManufactureOrderDetails_Quantity",new CJTSyncTypeRelation("数量", TableFieldTypeEnum.NUMBER)); - map.put("manufactureorderdetails_pubuserdefnvc2",new CJTSyncTypeRelation("备注1")); - map.put("Customer_Name",new CJTSyncTypeRelation("客户")); - CjtAccountEnum cjtAccountEnum = CjtAccountEnum.valueOf(cjt); - switch (cjtAccountEnum){ + map.put("manufactureorderdetails_sourcevouchercode", new CJTSyncTypeRelation("来源单号")); + map.put("Code", new CJTSyncTypeRelation("单据编码")); + map.put("CreatedTime", new CJTSyncTypeRelation("创建时间")); + map.put("Department_Name", new CJTSyncTypeRelation("生产车间")); + map.put("person_name", new CJTSyncTypeRelation("负责人")); + map.put("ManufactureOrderDetails_Inventory_Code", new CJTSyncTypeRelation("产品编码")); + map.put("ManufactureOrderDetails_Inventory_Name", new CJTSyncTypeRelation("存货")); + map.put("ManufactureOrderDetails_Inventory_Specification", new CJTSyncTypeRelation("规格型号")); + map.put("ManufactureOrderDetails_Unit_Name", new CJTSyncTypeRelation("生产单位")); + map.put("ManufactureOrderDetails_Quantity", new CJTSyncTypeRelation("数量", TableFieldTypeEnum.NUMBER)); + map.put("ManufactureOrderDetails_pubuserdefnvc2", new CJTSyncTypeRelation("备注1")); + map.put("Customer_Name", new CJTSyncTypeRelation("客户")); + map.put("ManufactureOrderDetails_priuserdefnvc1", new CJTSyncTypeRelation("合并字段")); + CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(cjt); + switch (cjtAccountEnum) { case ONE: - map.put("ManufactureOrderDetails_priuserdefnvc1",new CJTSyncTypeRelation("合并字段")); break; case TWO: - map.put("manufactureorderdetails_priuserdefnvc1",new CJTSyncTypeRelation("钢板面")); + map.put("ManufactureOrderDetails_pubuserdefnvc1", new CJTSyncTypeRelation("钢板面")); break; } return map; @@ -102,4 +104,4 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract{ protected String getQueryKey() { return "ManufactureOrder"; } -} +} \ No newline at end of file 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 8545ed8..6d7ec33 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 @@ -58,16 +58,16 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract { protected List getQueryFields() { return Arrays.asList( "SaleDelivery.Code", - "SaleDelivery.Customer.ID", + "SaleDelivery.Customer.Name", "SaleDelivery.BusinessType.Name", "SaleDelivery.CreatedTime", "SaleDelivery.auditeddate", "SaleDelivery.VoucherDate", - "SaleDelivery.SaleOrderCode", + "SaleDelivery.SaleDeliveryDetails.SaleOrderCode", "SaleDelivery.SaleDeliveryDetails.Inventory.Code", "SaleDelivery.SaleDeliveryDetails.Inventory.Name", "SaleDelivery.SaleDeliveryDetails.Inventory.Specification", - "SaleDelivery.pubuserdefnvc1", + "SaleDelivery.SaleDeliveryDetails.pubuserdefnvc1", "SaleDelivery.SaleDeliveryDetails.Unit.Name", "SaleDelivery.SaleDeliveryDetails.Quantity", "SaleDelivery.SaleDeliveryDetails.OrigDiscountAmount", @@ -79,16 +79,16 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract { protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); map.put("code", new CJTSyncTypeRelation("单据编号")); - map.put("Customer_ID", new CJTSyncTypeRelation("客户")); + map.put("customer_name", new CJTSyncTypeRelation("客户")); map.put("BusinessType_Name", new CJTSyncTypeRelation("业务类型")); map.put("CreatedTime", new CJTSyncTypeRelation("创建时间", TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS)); map.put("auditeddate", new CJTSyncTypeRelation("审核时间")); map.put("voucherdate", new CJTSyncTypeRelation("单据日期")); - map.put("saleordercode", new CJTSyncTypeRelation("销售订单号")); + map.put("saledeliverydetails_saleordercode", new CJTSyncTypeRelation("销售订单号")); map.put("SaleDeliveryDetails_Inventory_Code", new CJTSyncTypeRelation("存货编码")); map.put("SaleDeliveryDetails_Inventory_Name", new CJTSyncTypeRelation("存货")); map.put("SaleDeliveryDetails_Inventory_Specification", new CJTSyncTypeRelation("规格型号")); - map.put("pubuserdefnvc1", new CJTSyncTypeRelation("钢板面")); + map.put("saledeliverydetails_pubuserdefnvc1", new CJTSyncTypeRelation("钢板面")); map.put("SaleDeliveryDetails_Unit_Name", new CJTSyncTypeRelation("销售单位")); map.put("SaleDeliveryDetails_Quantity", new CJTSyncTypeRelation("数量", TableFieldTypeEnum.NUMBER)); map.put("SaleDeliveryDetails_OrigDiscountAmount", new CJTSyncTypeRelation("金额", TableFieldTypeEnum.NUMBER)); 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 1b2b63d..71c0006 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 @@ -59,7 +59,7 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ "SaleOrder.voucherdate", "SaleOrder.code", "SaleOrder.createdtime", - "SaleOrder.idcustomer", + "SaleOrder.Customer.Name", "SaleOrder.auditeddate", "SaleOrder.voucherState.Name", "SaleOrder.SaleOrderDetails.Inventory.Code", @@ -70,6 +70,7 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ "SaleOrder.SaleOrderDetails.executedQuantity", "SaleOrder.SaleOrderDetails.pubuserdefnvc1", "SaleOrder.SaleOrderDetails.DetailMemo", + "SaleOrder.memo", "SaleOrder.SaleOrderDetails.pubuserdefnvc2", "SaleOrder.SaleOrderDetails.origDiscountAmount"); } @@ -80,7 +81,7 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ map.put("voucherdate",new CJTSyncTypeRelation("单据日期")); map.put("code",new CJTSyncTypeRelation("编号")); map.put("createdtime",new CJTSyncTypeRelation("生单时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS)); - map.put("idcustomer",new CJTSyncTypeRelation("客户id")); + map.put("customer_name",new CJTSyncTypeRelation("客户")); map.put("auditeddate",new CJTSyncTypeRelation("审核日期")); map.put("voucherstate_name",new CJTSyncTypeRelation("单据状态")); map.put("SaleOrderDetails_Inventory_Code",new CJTSyncTypeRelation("存货编码")); @@ -91,7 +92,7 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ map.put("SaleOrderDetails_executedQuantity",new CJTSyncTypeRelation("累计执行数量", TableFieldTypeEnum.NUMBER)); map.put("SaleOrderDetails_pubuserdefnvc1",new CJTSyncTypeRelation("钢板面")); map.put("SaleOrderDetails_DetailMemo",new CJTSyncTypeRelation("明细备注")); - CjtAccountEnum cjtAccountEnum = CjtAccountEnum.valueOf(cjt); + CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(cjt); switch (cjtAccountEnum){ case ONE: map.put("memo",new CJTSyncTypeRelation("备注1")); 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 7948c5d..690f844 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 @@ -352,6 +352,9 @@ public abstract class SyncAccountsJobAbstract { List uniqueKeyList = new ArrayList<>(); for (int i = 0; i < row.size(); i++) { CJTSyncTypeRelation cjtSyncTypeRelation = queryFieldsMap.get(keyList.get(i)); + if (cjtSyncTypeRelation == null){ + continue; + } String larkLabel = cjtSyncTypeRelation.getLarkFileName(); String value = row.get(i); if (uniqueFields.contains(keyList.get(i))){