diff --git a/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs b/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs index 5186c9a..7f77f6b 100644 --- a/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs +++ b/Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs @@ -93,6 +93,11 @@ namespace Pilot_KD_Parino.Sal_Order break; //this.View.ShowMessage("没有上查关联的跨组织的采购订单"); + } + else if ( dt.Count > 1 ) + { + throw new KDBusinessException("", "一张销售单下推多张采购订单,不能用自动跨组织推单功能:" + tablename); + } else { @@ -110,6 +115,11 @@ namespace Pilot_KD_Parino.Sal_Order { throw new KDBusinessException("", "没有上查关联的跨组织的采购订单:" + tablename); } + else if (dt.Count > 1) + { + throw new KDBusinessException("", "一张销售单下推多张采购订单,不能用自动跨组织推单功能:" + tablename); + + } else { xiaoFid = tempFid; diff --git a/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs b/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs index da950e4..ccaf4e0 100644 --- a/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs +++ b/Pilot_KD_Parino/Sal_Order/SalDeliveryNoticeAudit.cs @@ -80,7 +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) + if (dt == null || dt.Count == 0 || dt.Count>1) { //throw new KDBusinessException("", "没有找到跨组织的采购申请单:" + getSourceSql); return; @@ -98,7 +98,7 @@ 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) + if (dt == null || dt.Count == 0 || dt.Count > 1) { //throw new KDBusinessException("", "没有找到跨组织的采购订单:" + getSourceSql); return; @@ -115,7 +115,7 @@ namespace Pilot_KD_Parino.Sal_Order getSourceSql = $@"/*dialect*/SELECT FSTABLENAME,FSBILLID,FENTRYID FROM T_SAL_ORDERENTRY_LK WHERE FSBILLID = {tempFid} and FSTABLENAME='t_PUR_POOrderEntry' "; dt = DBServiceHelper.ExecuteDynamicObject(this.Context, getSourceSql); - if (dt == null || dt.Count == 0) + if (dt == null || dt.Count == 0 || dt.Count > 1) { //throw new KDBusinessException("", "没有找到跨组织的销售订单:" + getSourceSql); return;