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