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:
hello 2025-08-01 16:36:15 +08:00
parent 42a0b2cb1e d9659d4311
commit 554a453476
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,17 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
super.itemClick(evt); super.itemClick(evt);
String itemKey = evt.getItemKey(); String itemKey = evt.getItemKey();
if (itemKey.equals("zcgj_idle")){//闲置 if (itemKey.equals("zcgj_idle")){//闲置
Set<Long> setIds = getSelectOrderIds(this.getSelectedRows());
DynamicObject[] equipments = BusinessDataServiceHelper.load("eceq_equipment_card", "billno,billname,equipstatus", new QFilter[]{new QFilter("id", "in", setIds)});
for (DynamicObject equipment : equipments) {
equipment.set("equipstatus","FREE");
}
Object[] save = SaveServiceHelper.save(equipments);
System.out.println();
this.getView().showMessage("闲置成功！");
IFormView view = this.getView();
view.invokeOperation("refresh");
} else if (itemKey.equals("zcgj_asset")) {//同步资产卡片
Set<String> strings = new HashSet(); Set<String> strings = new HashSet();
DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )}); DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )});
for (DynamicObject dynamicObject : equipmenttype) { for (DynamicObject dynamicObject : equipmenttype) {
@ -69,10 +80,14 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
orgIds.add(orgId); orgIds.add(orgId);
List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true);
Set<Long> orgSer = subOrgIds.stream().collect(Collectors.toSet()); Set<Long> orgSer = subOrgIds.stream().collect(Collectors.toSet());
Set<String> orgcset = new HashSet();
for (Long l : orgSer) {
orgcset.add(l.toString());
}
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
qFilter.and(new QFilter("assetunit.number", QCP.in, orgSer)) ; QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer);
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,qFilter2});
log.info("同步的实物数量有"+realcards.length); log.info("同步的实物数量有"+realcards.length);
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码

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

@ -55,10 +55,14 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
orgIds.add(orgId); orgIds.add(orgId);
List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true);
Set<Long> orgSer = subOrgIds.stream().collect(Collectors.toSet()); Set<Long> orgSer = subOrgIds.stream().collect(Collectors.toSet());
Set<String> orgcset = new HashSet();
for (Long l : orgSer) {
orgcset.add(l.toString());
}
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings);
qFilter.and(new QFilter("assetunit.number", QCP.in, orgSer)) ; QFilter qFilter2 = new QFilter("assetunit.id", QCP.in, orgSer);
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,qFilter2});
log.info("同步的实物数量有"+realcards.length); log.info("同步的实物数量有"+realcards.length);
for (DynamicObject realcard : realcards) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码