From 942ae6ead4f1845577da459481efd4406db69fda Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Wed, 6 Aug 2025 12:40:23 +0800
Subject: [PATCH] youhua

---
 .../zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java   | 4 +++-
 .../zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
index 84a212e..b465968 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
@@ -90,8 +90,10 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
             }
             QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
             QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer);
+            QFilter qFilter3 = new QFilter("bizstatus", QCP.equals, "DELETE");
+            QFilter qFilter4 = new QFilter("billstatus", QCP.equals, "C");
             DynamicObject[] realcards = BusinessDataServiceHelper.load("fa_asset_card", "zcgj_costcenter,headusedept,finentry,assetcat,number,assetname,model,realaccountdate," +
-                    "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval,finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth", new QFilter[]{qFilter,qFilter2});
+                    "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval,finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth", new QFilter[]{qFilter,qFilter2,qFilter3,qFilter4});
             log.info("同步的实物数量有"+realcards.length);
             String operationResultErrorInfos = null;
             for (DynamicObject realcard : realcards) {
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
index f826efe..3a6bdaf 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
@@ -64,8 +64,10 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
         }
         QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
         QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer);
+        QFilter qFilter3 = new QFilter("bizstatus", QCP.equals, "DELETE");
+        QFilter qFilter4 = new QFilter("billstatus", QCP.equals, "C");
         DynamicObject[] realcards = BusinessDataServiceHelper.load("fa_asset_card", "zcgj_costcenter,headusedept,finentry,assetcat,number,assetname,model,realaccountdate," +
-                "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval,finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth", new QFilter[]{qFilter,qFilter2});
+                "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval,finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth", new QFilter[]{qFilter,qFilter2,qFilter3,qFilter4});
         log.info("同步的实物数量有"+realcards.length);
         String operationResultErrorInfos = null;
         for (DynamicObject realcard : realcards) {