diff --git a/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs b/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs index c23cda8..1c25b4c 100644 --- a/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs +++ b/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs @@ -80,6 +80,7 @@ namespace Pilot_KD_Parino.Sal_Order getSourceSql = $@"/*dialect*/SELECT FSTABLENAME,FSBILLID,FENTRYID FROM T_PUR_ReqEntry_LK WHERE FSBILLID = {tempFid} and FSTABLENAME='T_SAL_ORDERENTRY' "; dt = DBServiceHelper.ExecuteDynamicObject(this.Context, getSourceSql); + if (dt == null || dt.Count == 0 || dt.Count>1) { //throw new KDBusinessException("", "没有找到跨组织的采购申请单:" + getSourceSql); @@ -87,6 +88,12 @@ namespace Pilot_KD_Parino.Sal_Order } else { + var FSBILLIDList = dt.Select(t => t["FSBILLID"].ToString()).Distinct().ToList(); + if (FSBILLIDList.Count > 1) + { + return; + } + //采购订单 tempFid = int.Parse(dt.Select(t => t["FSBILLID"]).FirstOrDefault().ToString()); tablename = dt.Select(t => t["FSTABLENAME"]).FirstOrDefault().ToString(); @@ -98,13 +105,18 @@ namespace Pilot_KD_Parino.Sal_Order getSourceSql = $@"/*dialect*/SELECT FSTABLENAME,FSBILLID,FENTRYID FROM t_PUR_POOrderEntry_LK WHERE FSBILLID = {tempFid} and FSTABLENAME='T_PUR_ReqEntry' "; dt = DBServiceHelper.ExecuteDynamicObject(this.Context, getSourceSql); - if (dt == null || dt.Count == 0 || dt.Count > 1) + if (dt == null || dt.Count == 0) { //throw new KDBusinessException("", "没有找到跨组织的采购订单:" + getSourceSql); return; } else { + var FSBILLIDList2 = dt.Select(t => t["FSBILLID"].ToString()).Distinct().ToList(); + if (FSBILLIDList2.Count > 1) + { + return; + } //兴诺的销售订单 tempFid = int.Parse(dt.Select(t => t["FSBILLID"]).FirstOrDefault().ToString()); tablename = dt.Select(t => t["FSTABLENAME"]).FirstOrDefault().ToString();