diff --git a/lc123/cloud/app/api/controller/SupplierControl.java b/lc123/cloud/app/api/controller/SupplierControl.java index cb04e57..befe102 100644 --- a/lc123/cloud/app/api/controller/SupplierControl.java +++ b/lc123/cloud/app/api/controller/SupplierControl.java @@ -15,7 +15,6 @@ import kd.bos.openapi.common.custom.annotation.ApiResponseBody; import kd.bos.openapi.common.result.CustomApiResult; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; -import kd.bos.servicehelper.AttachmentServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.OperationServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; @@ -104,7 +103,7 @@ public class SupplierControl implements Serializable { rowMsg.add("供应商银行信息分录为空"); billStatus = false; } else { - Boolean isdefault_bank = false; + int defaultCount = 0; for (int j = 0; j < entry_bank.size(); j++) { SupplierModel.DataBean.BankBean bankBean = entry_bank.get(j); String bank_number = bankBean.getBank_number(); @@ -112,7 +111,10 @@ public class SupplierControl implements Serializable { rowMsg.add("供应商开户银行.编码(行号)字段【bank_number】为空"); billStatus = false; } - isdefault_bank = bankBean.getIsdefault_bank(); + Boolean isdefault_bank = bankBean.getIsdefault_bank(); + if (isdefault_bank) { + defaultCount++; + } String accountname = bankBean.getAccountname(); if (StringUtils.isEmpty(accountname)) { rowMsg.add("供应商银行信息分录.收款方名称字段【accountname】为空"); @@ -125,9 +127,12 @@ public class SupplierControl implements Serializable { } Integer seq = bankBean.getSeq(); } - if (!isdefault_bank) { + if (defaultCount == 0) { rowMsg.add("供应商银行信息分录要有一行默认的银行账号"); billStatus = false; + } else if (defaultCount > 1) { + rowMsg.add("只能有一行默认的银行账号"); + billStatus = false; } } List entry_linkman = dataBean.getEntry_linkman(); @@ -135,7 +140,7 @@ public class SupplierControl implements Serializable { rowMsg.add("供应商联系人分录为空"); billStatus = false; } else { - Boolean isdefault_linkman = false; + int defaultCount = 0; for (int k = 0; k < entry_linkman.size(); k++) { SupplierModel.DataBean.LinkmanBean linkmanBean = entry_linkman.get(k); String contactperson = linkmanBean.getContactperson(); @@ -155,11 +160,17 @@ public class SupplierControl implements Serializable { rowMsg.add("供应商联系人分录.详细地址字段【tqq9_textfield_xxdz】为空"); billStatus = false; } - isdefault_linkman = linkmanBean.getIsdefault_linkman(); + Boolean isdefault_linkman = linkmanBean.getIsdefault_linkman(); + if (isdefault_linkman) { + defaultCount++; + } } - if (!isdefault_linkman) { + if (defaultCount == 0) { rowMsg.add("联系人信息中需要有一个默认且有效的联系人"); billStatus = false; + } else if (defaultCount > 1) { + rowMsg.add("只能有一行默认联系热"); + billStatus = false; } } List attachment = dataBean.getAttachment();