From 6d8065fd16bf9146dca418f6d2d0b747207b00a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=B4=B5=E5=BC=BA?= <liguiqiang@x-ri.com>
Date: Fri, 3 Jan 2025 16:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=B5=8B=E7=AE=97=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repc/recos/formplugin/MeasureciFormPlugin.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java b/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java
index a91e862..570ce88 100644
--- a/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java
+++ b/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java
@@ -33,11 +33,12 @@ public class MeasureciFormPlugin extends AbstractFormPlugin {
             DynamicObjectCollection productentry = repmd_projectbill.getDynamicObjectCollection("productentry");//获取对应产品
             List<DynamicObject> children = productentry .stream().filter(e -> e.getDynamicObject("productentry_producttype").getString("id").equals(producttypeid.toString())).collect(Collectors.toList());
             DynamicObjectCollection qeug_entryentity = children.get(0).getDynamicObjectCollection("qeug_subentryentity");//子单据体
-            Map<String, BigDecimal> result = new HashMap<>();
+            Map<String, Object> result = new HashMap<>();
             for (int i = 0; i <qeug_entryentity.size() ; i++) {
                 DynamicObject dynamicObject = qeug_entryentity.get(i);
                 BigDecimal sum = dynamicObject.getBigDecimal("qeug_jrgsbsz");
-                result.put(dynamicObject.getString("qeug_kmname"),sum);
+                String remark = dynamicObject.getString("qeug_remark");
+                result.put(dynamicObject.getString("qeug_kmname"),new Object[]{sum,remark});
             }
             EntryGrid cientry = this.getControl("cientry");
             int[] selectRows = cientry.getSelectRows();
@@ -56,10 +57,15 @@ public class MeasureciFormPlugin extends AbstractFormPlugin {
             }
             //遍历赋值工程量基数
             result.forEach((key, value) -> {
+                BigDecimal sum = (BigDecimal) ((Object[]) value)[0]; // 获取工程量基数
+                String remark = (String) ((Object[]) value)[1]; // 获取备注
+
                 for (DynamicObject dynamicObject : myList) {
                     if (dynamicObject.getString("entry_accountname").equals(key)){
-//                        this.getModel().setValue("entry_workload",value,(int)dynamicObject.get("seq")-1);//工程量
-                        this.getModel().setValue("qeug_gcljs",value,(int)dynamicObject.get("seq")-1);//工程量基数
+                        //设置工程量基数
+                        this.getModel().setValue("qeug_gcljs",sum,(int)dynamicObject.get("seq")-1);
+                        // 设置说明
+                        this.getModel().setValue("entry_description", remark, (int) dynamicObject.get("seq") - 1);
                     }
                 }
             });