优化支出合同结算逻辑

Merge remote-tracking branch 'origin/dev' into dev
优化标识
2025-11-05 16:35:41 +08:00 · 2025-11-05 16:20:45 +08:00 · 2025-11-05 10:41:42 +08:00 · 2025-11-04 16:34:13 +08:00 · 2025-11-04 16:05:10 +08:00
2 changed files with 1089 additions and 11 deletions
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
--- 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
@ -207,7 +207,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
                eceq_equipment.set("zcgj_preusingamount",fin_preusingamount);
                eceq_equipment.set("zcgj_unitprice",finOriginalval);
                eceq_equipment.set("org",assetunit);//管理组织
-                eceq_equipment.set("equipstatus","FREE");//设备状态
+//                eceq_equipment.set("equipstatus","FREE");//设备状态//更新设备时不更新设备状态
                eceq_equipment.set("project",null);//工程项目
                eceq_equipment.set("zcgj_assetnumber",number);//资产编码
                eceq_equipment.set("zcgj_headusedepts",headusedept);//使用部门
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