From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +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