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_KaipiaoshenqingBLL.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index d048350..818249d 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -157,29 +157,29 @@
Condition += " and ok.BusinessManagerId = '" + BusinessManagerId + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
-
- if (!string.IsNullOrEmpty(PayStates))
- {
- if (PayStates == "2")
- {
- Condition += " 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 ) ";
- }
- else if (PayStates == "1")
- {
- Condition += " 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 ) ";
- }
- }
if (!string.IsNullOrEmpty(HuikuanStates))
{
if (HuikuanStates == "2")
{
- Condition += " and ok.Huikuanmoney >0 ";
+ Condition += " and ok.Huikuanmoney >= kpmoney ";
}
else if (HuikuanStates == "1")
{
- Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
+ 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>()
--
Gitblit v1.9.1