diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index e84ba78..c1dc00a 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -71,7 +71,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, "")); } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理 dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功 - dzhdqFilter.or(new QFilter("shkd_businessname", QCP.equals, "GX").and(new QFilter("shkd_lctszt",QCP.not_equals,"2")));//共享主动推过来的且还未同步 + dzhdqFilter = dzhdqFilter.or((new QFilter("shkd_businessname", QCP.equals, "GX").and(new QFilter("shkd_lctszt",QCP.not_equals,"2"))));//共享主动推过来的且还未同步 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D"))); }else { @@ -104,7 +104,6 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { if (bei_elecreceiptids.length==0){ this.getView().showTipNotification("未找能推送的单据"); } - String shkd_url = shkd_apimapping.getString("shkd_url"); Map headMap = new HashMap<>(); DynamicObjectCollection shkdHeade = shkd_apimapping.getDynamicObjectCollection("shkd_heade"); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 08439de..d260511 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -70,7 +70,7 @@ public class SharePushTaskPlugin extends AbstractTask { dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, "")); } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理 dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功 - dzhdqFilter.or(new QFilter("shkd_businessname", QCP.equals, "GX").and(new QFilter("shkd_lctszt",QCP.not_equals,"2")));//共享主动推过来的且还未同步 + dzhdqFilter = dzhdqFilter.or((new QFilter("shkd_businessname", QCP.equals, "GX").and(new QFilter("shkd_lctszt",QCP.not_equals,"2"))));//共享主动推过来的且还未同步 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D"))); } else {