Merge branch 'refs/heads/dev-zzs' into test

This commit is contained in:
violet 2024-09-02 19:46:29 +08:00
commit 8dc728d79f

View File

@ -43,6 +43,8 @@ public class SaleOrdeExportisVoidValidator extends AbstractValidator {
MoneyClaim(dataEntity, dataEntitie); MoneyClaim(dataEntity, dataEntitie);
//5合同是否有对应的客商额度申请的额度占用并且未释放额度如果有不能作废 //5合同是否有对应的客商额度申请的额度占用并且未释放额度如果有不能作废
Merchant(dataEntity, dataEntitie); Merchant(dataEntity, dataEntitie);
//6.合同下存在内审预算单不能作废
Getintauditbusa(dataEntity, dataEntitie);
//弱校验 //弱校验
//1合同是否在礼品资金池有对应的礼品来源如果有弹框点击确定确定后删除对于礼品资金池对于合同号的礼品来源分录及其子分录参考反审核的逻辑 //1合同是否在礼品资金池有对应的礼品来源如果有弹框点击确定确定后删除对于礼品资金池对于合同号的礼品来源分录及其子分录参考反审核的逻辑
Giftamount(dataEntity, dataEntitie); Giftamount(dataEntity, dataEntitie);
@ -173,10 +175,11 @@ public class SaleOrdeExportisVoidValidator extends AbstractValidator {
/** /**
* 合同是否在礼品资金池有对应的礼品来源如果有弹框点击确定确定后删除对于礼品资金池对于合同号的礼品来源分录及其子分录参考反审核的逻辑 * 合同是否在礼品资金池有对应的礼品来源如果有弹框点击确定确定后删除对于礼品资金池对于合同号的礼品来源分录及其子分录参考反审核的逻辑
*
* @param dataEntity 对象 * @param dataEntity 对象
* @param dataEntitie 数据实体 * @param dataEntitie 数据实体
*/ */
public void Giftamount(DynamicObject dataEntity, ExtendedDataEntity dataEntitie){ public void Giftamount(DynamicObject dataEntity, ExtendedDataEntity dataEntitie) {
List list = new ArrayList<>(); List list = new ArrayList<>();
String billno = dataEntity.getString("billno"); String billno = dataEntity.getString("billno");
Object pkValue = dataEntity.getPkValue(); Object pkValue = dataEntity.getPkValue();
@ -194,4 +197,28 @@ public class SaleOrdeExportisVoidValidator extends AbstractValidator {
this.addWarningMessage(dataEntitie, "当前单据【" + billno + "】已存在礼品资金池【" + s + "】,是否作废!"); this.addWarningMessage(dataEntitie, "当前单据【" + billno + "】已存在礼品资金池【" + s + "】,是否作废!");
} }
} }
/**
* 合同存在内审预算单禁止作废强控
*
* @param dataEntity 对象
* @param dataEntitie 数据实体
*/
public void Getintauditbusa(DynamicObject dataEntity, ExtendedDataEntity dataEntitie) {
List list = new ArrayList<>();
String billno = dataEntity.getString("billno");
Object pkValue = dataEntity.getPkValue();
QFilter qFilter = new QFilter("billno", QCP.equals, billno);
DynamicObjectCollection yem_shippingdetails = QueryServiceHelper.query("yem_im_intauditbusa", "id,billno", new QFilter[]{qFilter}, null);
if (yem_shippingdetails.size() > 0) {
for (DynamicObject shippingdetails : yem_shippingdetails) {
String shippbillno = shippingdetails.getString("billno");
list.add(shippbillno);
}
}
if (list.size() > 0) {
String s = DebCredUtils.dedupAndJoin(list, ";");
this.addErrorMessage(dataEntitie, "当前单据【" + billno + "】已存在内审预算单【" + s + "】,禁止作废!");
}
}
} }