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-01 14:05:21 +08:00
parent 31f7ebf78d 82ec9a3155
commit 5c4d04271f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,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.and(new QFilter("assetunit.fullname", QCP.like, "中材矿山")) ;
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}); "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});
log.info("同步的实物数量有"+realcards.length);
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码
// DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
@ -105,8 +107,9 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
}else{ }else{
equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号 equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
} }
}else{
equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
} }
equipmentcard.set("billno",timeText);//单据编号 equipmentcard.set("billno",timeText);//单据编号
equipmentcard.set("status","C");//单据状态 equipmentcard.set("status","C");//单据状态
equipmentcard.set("billstatus","C");// equipmentcard.set("billstatus","C");//

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

@ -46,8 +46,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.and(new QFilter("assetunit.fullname", QCP.like, "中材矿山")) ;
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}); "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});
log.info("同步的实物数量有"+realcards.length);
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码
// DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
@ -91,6 +93,8 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
}else{ }else{
equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号 equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
} }
}else{
equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
} }
equipmentcard.set("billno",timeText);//单据编号 equipmentcard.set("billno",timeText);//单据编号