From c4867cf5e5f78cfb924a3048bd0c4232d4a1e986 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 十二月 2024 08:33:44 +0800
Subject: [PATCH] 新增审批 付款申请 再付款申请中操作其他付款付款 生产管理里边点采购的供应商修改
---
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index a98c77f..818249d 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -139,9 +139,9 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Kaipiaoshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName)
+ string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string PayStates, string HuikuanStates)
{
- string Condition = " and ok.FirmId ='" + FirmId + "' ";
+ string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
if (!string.IsNullOrEmpty(CreateTimeStart))
Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";
@@ -157,13 +157,36 @@
Condition += " and ok.BusinessManagerId = '" + BusinessManagerId + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(HuikuanStates))
+ {
+ if (HuikuanStates == "2")
+ {
+ Condition += " and ok.Huikuanmoney >= kpmoney ";
+ }
+ else if (HuikuanStates == "1")
+ {
+ Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney < kpmoney ) ";
+ }
+ }
+ if (!string.IsNullOrEmpty(PayStates))
+ {
+ if (PayStates == "2")
+ {
+ Condition += " and (( ok.Shenqingleixing ='璁㈠崟寮�绁�' and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney]>=ok.[kpmoney] ) )";
+ }
+ else if (PayStates == "1")
+ {
+ Condition += " and ( ( ok.Shenqingleixing ='璁㈠崟寮�绁�' and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney] < ok.[kpmoney] ) )";
+ }
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
{
new Criterion("", Condition),
- new Criterion("orderBy"," SellerOrderId desc ")
+ new Criterion("orderBy"," CreateTime desc ")
};
query.Criteria = criterias;
return _IOA_KaipiaoshenqingDAL.SelectModelPage(query, pa);
--
Gitblit v1.9.1