From a0d38325a97957b37dd755bf732b63f6f7e2a5ff Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 十二月 2024 08:40:48 +0800
Subject: [PATCH] 修改外协付款
---
CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
index 7f4b51f..18388a4 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
@@ -140,7 +140,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Fukuanshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Creater, string SupplierName,string shifoufukuan)
+ string Creater, string SupplierName,string shifoufukuan,string selFukuanyongtu)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
@@ -154,9 +154,11 @@
Condition += " and ok.Creater like '%" + Creater + "%'";
if (!string.IsNullOrEmpty(SupplierName))
- Condition += " and oe.Name like '%" + SupplierName + "%'";
+ Condition += " and ok.SupplierName like '%" + SupplierName + "%' ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
+ if (!string.IsNullOrEmpty(selFukuanyongtu))
+ Condition += " and ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
@@ -176,7 +178,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Fukuanshenqing> SelectModelPageweikaipiao(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Creater, string SupplierName, string shifoufukuan)
+ string Creater, string SupplierName, string shifoufukuan, string selFukuanyongtu)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 and ok.Youwufapiao !=2 and ok.FukuanStatus = 2 ";
@@ -190,9 +192,11 @@
Condition += " and ok.Creater like '%" + Creater + "%'";
if (!string.IsNullOrEmpty(SupplierName))
- Condition += " and oe.Name like '%" + SupplierName + "%'";
+ Condition += " and ok.SupplierName like '%" + SupplierName + "%' ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
+ if (!string.IsNullOrEmpty(selFukuanyongtu))
+ Condition += " and ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
--
Gitblit v1.9.1