From b97ca5cb47ad91ed451616cb07b8dee9f66851a9 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Fri, 18 Apr 2025 10:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=96=B0=E5=A2=9E=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=AE=A2=E5=95=86=E8=AE=BE=E7=BD=AEfreevalue1?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../private/nc/bs/gl/voucher/VoucherBO.java   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/gl/src/private/nc/bs/gl/voucher/VoucherBO.java b/gl/src/private/nc/bs/gl/voucher/VoucherBO.java
index 80b041a..9ab23a2 100644
--- a/gl/src/private/nc/bs/gl/voucher/VoucherBO.java
+++ b/gl/src/private/nc/bs/gl/voucher/VoucherBO.java
@@ -3558,8 +3558,16 @@ public class VoucherBO {
 			for (int i = 0; i < details.length; i++) {
 				detailTemp = details[i];
 				detailTemp.setPk_detail(pks[i]);
-//				AssVO[] ass= details[i].getAss();
-
+				if(details[i].getAss().length>0){
+					String freevalue1="";
+					AssVO[] ass= detailTemp.getAss();
+					for (int j = 0; j < ass.length; j++) {
+						if(ass[j].getChecktypename().equals("客户档案") || ass[j].getChecktypename().equals("供应商档案")){
+							freevalue1 =freevalue1+ass[j].getCheckvaluename()+" ";
+						}
+					}
+					detailTemp.setFreevalue1(freevalue1);
+				}
 				if (details[i].getFreevalue1() != null || details[i].getFreevalue2() != null || details[i].getFreevalue3() != null || details[i].getFreevalue4() != null || details[i].getFreevalue5() != null || details[i].getFreevalue6() != null || details[i].getFreevalue7() != null || details[i].getFreevalue8() != null || details[i].getFreevalue9() != null || details[i].getFreevalue10() != null
 						|| details[i].getFreevalue11() != null || details[i].getFreevalue12() != null || details[i].getFreevalue13() != null || details[i].getFreevalue14() != null || details[i].getFreevalue15() != null || details[i].getFreevalue16() != null || details[i].getFreevalue17() != null || details[i].getFreevalue18() != null || details[i].getFreevalue19() != null
 						|| details[i].getFreevalue20() != null || details[i].getFreevalue21() != null || details[i].getFreevalue22() != null || details[i].getFreevalue23() != null || details[i].getFreevalue24() != null || details[i].getFreevalue25() != null || details[i].getFreevalue26() != null || details[i].getFreevalue27() != null || details[i].getFreevalue28() != null
@@ -3688,6 +3696,7 @@ public class VoucherBO {
 			for (int i = 0; i < details.length; i++) {
 				detailTemp = details[i];
 				detailTemp.setPk_detail(pks[i]);
+
 				if (details[i].getFreevalue1() != null || details[i].getFreevalue2() != null || details[i].getFreevalue3() != null || details[i].getFreevalue4() != null || details[i].getFreevalue5() != null || details[i].getFreevalue6() != null || details[i].getFreevalue7() != null || details[i].getFreevalue8() != null || details[i].getFreevalue9() != null || details[i].getFreevalue10() != null
 						|| details[i].getFreevalue11() != null || details[i].getFreevalue12() != null || details[i].getFreevalue13() != null || details[i].getFreevalue14() != null || details[i].getFreevalue15() != null || details[i].getFreevalue16() != null || details[i].getFreevalue17() != null || details[i].getFreevalue18() != null || details[i].getFreevalue19() != null
 						|| details[i].getFreevalue20() != null || details[i].getFreevalue21() != null || details[i].getFreevalue22() != null || details[i].getFreevalue23() != null || details[i].getFreevalue24() != null || details[i].getFreevalue25() != null || details[i].getFreevalue26() != null || details[i].getFreevalue27() != null || details[i].getFreevalue28() != null
@@ -4183,6 +4192,16 @@ public class VoucherBO {
 		Vector tempfreevalue = new Vector();
 		for (int i = 0; i < details.length; i++) {
 			details[i].setPk_detail(pks[i]);
+			if(details[i].getAss().length>0){
+				String freevalue1="";
+				AssVO[] ass= details[i].getAss();
+				for (int j = 0; j < ass.length; j++) {
+					if(ass[j].getChecktypename().equals("客户档案") || ass[j].getChecktypename().equals("供应商档案")){
+						freevalue1 =freevalue1+ass[j].getCheckvaluename()+" ";
+					}
+				}
+				details[i].setFreevalue1(freevalue1);
+			}
 			if (details[i].getFreevalue1() != null || details[i].getFreevalue2() != null || details[i].getFreevalue3() != null || details[i].getFreevalue4() != null || details[i].getFreevalue5() != null || details[i].getFreevalue6() != null || details[i].getFreevalue7() != null || details[i].getFreevalue8() != null || details[i].getFreevalue9() != null
 					|| details[i].getFreevalue10() != null || details[i].getFreevalue11() != null || details[i].getFreevalue12() != null || details[i].getFreevalue13() != null || details[i].getFreevalue14() != null || details[i].getFreevalue15() != null || details[i].getFreevalue16() != null || details[i].getFreevalue17() != null || details[i].getFreevalue18() != null
 					|| details[i].getFreevalue19() != null || details[i].getFreevalue20() != null || details[i].getFreevalue21() != null || details[i].getFreevalue22() != null || details[i].getFreevalue23() != null || details[i].getFreevalue24() != null || details[i].getFreevalue25() != null || details[i].getFreevalue26() != null || details[i].getFreevalue27() != null