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 0c7ef1e..261989c 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 @@ -47,6 +47,14 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract { @Override protected List getUniqueFields(String cjt) { + CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(cjt); + if (cjtAccountEnum != null && cjtAccountEnum.equals(CjtAccountEnum.TWO)){ + return Arrays.asList( + "manufactureorderdetails_priuserdefnvc1",//合并字段 + "manufactureorderdetails_pubuserdefnvc2",//备注1 + "manufactureorderdetails_quantity");//数量 + + } return Arrays.asList( "code", "manufactureorderdetails_inventory_code", 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 b6bd201..900011f 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 @@ -47,8 +47,18 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract { @Override protected List getUniqueFields(String cjt) { + CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(cjt); + if (cjtAccountEnum != null && cjtAccountEnum.equals(CjtAccountEnum.TWO)){ + return Arrays.asList( + "code",//单据编号 + "saledeliverydetails_saleordercode",//销售订单号 + "saledeliverydetails_inventory_code",//存货编码 + "saledeliverydetails_quantity",//数量 + "memo");//备注1 + + } List list = new ArrayList<>(Arrays.asList( - "code", + "code",//单据编号 "saledeliverydetails_inventory_code", "saledeliverydetails_detailmemo")); return list; 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 f09e26e..eca95e5 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 @@ -46,6 +46,15 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ @Override protected List getUniqueFields(String cjt) { + CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(cjt); + if (cjtAccountEnum != null && cjtAccountEnum.equals(CjtAccountEnum.TWO)){ + return Arrays.asList( + "code",//编号 + "saleorderdetails_inventory_code",//存货编码 + "saleorderdetails_pubuserdefnvc1",//钢板面 + "saleorderdetails_detailmemo");//明细备注 + + } List list = Arrays.asList( "code", "saleorderdetails_inventory_code",