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

Compare commits

base: zhangzhiguo:4c9abbe0c69a741b55d96a25ff5e40c96dfc18b8
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
...
compare: zhangzhiguo:9cc062a69ce3632046436d7f96926d2e1137f177
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

5 Commits
4c9abbe0c6 ... 9cc062a69c

Author SHA1 Message Date
xuhaihui 9cc062a69c 优化支出合同结算逻辑 2025-11-05 16:35:41 +08:00
xuhaihui b93d3e8159 Merge remote-tracking branch 'origin/dev' into dev 2025-11-05 16:20:45 +08:00
xuhaihui 468d17c611 优化标识 2025-11-05 10:41:42 +08:00
xuhaihui 44f69553d8 优化 2025-11-04 16:34:13 +08:00
xuhaihui c59a3eab31 优化同步设备逻辑，更新设备时不更新设备状态 2025-11-04 16:05:10 +08:00
2 changed files with 1089 additions and 11 deletions
Show Stats Expand all files Collapse all files

1098
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
View File

File diff suppressed because it is too large Load Diff

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

@ -207,7 +207,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
eceq_equipment.set("zcgj_preusingamount",fin_preusingamount); eceq_equipment.set("zcgj_preusingamount",fin_preusingamount);
eceq_equipment.set("zcgj_unitprice",finOriginalval); eceq_equipment.set("zcgj_unitprice",finOriginalval);
eceq_equipment.set("org",assetunit);//管理组织 eceq_equipment.set("org",assetunit);//管理组织
eceq_equipment.set("equipstatus","FREE");//设备状态 // eceq_equipment.set("equipstatus","FREE");//设备状态//更新设备时不更新设备状态
eceq_equipment.set("project",null);//工程项目 eceq_equipment.set("project",null);//工程项目
eceq_equipment.set("zcgj_assetnumber",number);//资产编码 eceq_equipment.set("zcgj_assetnumber",number);//资产编码
eceq_equipment.set("zcgj_headusedepts",headusedept);//使用部门 eceq_equipment.set("zcgj_headusedepts",headusedept);//使用部门