zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xuhaihui 2025-08-06 14:11:36 +08:00
parent f2e7560de3 f45404050d
commit b880d268f6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
View File

@ -90,8 +90,10 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
} }
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer); 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," + 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); log.info("同步的实物数量有"+realcards.length);
String operationResultErrorInfos = null; String operationResultErrorInfos = null;
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {

4
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
View File

@ -64,8 +64,10 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
} }
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer); 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," + 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); log.info("同步的实物数量有"+realcards.length);
String operationResultErrorInfos = null; String operationResultErrorInfos = null;
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {