From 120215455f4fb2e5a1447f3ecda87f36aca1f38f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 二月 2026 08:54:22 +0800
Subject: [PATCH] 1)有到期时间的,到期前3个月变成红色(像人事管理那样);没有到期时间的,从建档时间起算,9个月后变成红色。完成 (2)建档后1个月没有下单,变成血红色。 完成 (3)列表中删除“完结状态”;操作中删除“订单关联” 完成 (4)在“应收款订单”后面增加“未收款金额” 、“逾期收款”完成
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs | 189 +++++++++++++++++++++++++++++++++++++++++++++++
CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs | 26 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx | 23 ++++-
4 files changed, 230 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
index 19cb69e..248c2f3 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
@@ -406,6 +406,9 @@
return _ordercount;
}
}
+
+
+
/// <summary>
/// 涓嬪崟浜у��
/// </summary>
@@ -617,6 +620,18 @@
/// 搴旀敹娆捐鍗曟暟閲�
/// </summary>
public int? NoOverOderCount { get; set; }
+
+
+ /// <summary>
+ /// 鏈敹娆鹃噾棰�
+ /// </summary>
+ public decimal? Weishoukuanjine { get; set; }
+
+ /// <summary>
+ /// 閫炬湡閲戦
+ /// </summary>
+ public decimal? Yuqijine { get; set; }
+
/// <summary>
/// 鍚堝悓鏁伴噺
/// </summary>
@@ -1112,7 +1127,16 @@
get;
set;
}
-
+
+
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public string Yanse
+ {
+ get;
+ set;
+ }
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 1b278b7..56cd407 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1553,7 +1553,7 @@
{
IList<EC_OrderBasic> result = new List<EC_OrderBasic>();
- result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and SellerId = '{2}'", BuyerId,PayState, SellerId));
+ result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and SellerId = '{2}' and [OrderState]!=0 and [OrderState] !=-2 ", BuyerId,PayState, SellerId));
return result;
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
index a672850..88522a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -287,14 +287,18 @@
</th>
<th style="text-align: center;">搴旀敹娆捐鍗�
</th>
+ <th style="text-align: center;">鏈敹娆鹃噾棰�
+ </th>
+ <th style="text-align: center;">閫炬湡鏀舵
+ </th>
<th style="text-align: center;">涓嬪崟浜у��
</th>
<th style="text-align: center;">鏈笅鍗曢噾棰�
</th>
<th style="text-align: center;">鍚堝悓
</th>
- <th style="text-align: center;">瀹岀粨鐘舵��
- </th>
+ <%-- <th style="text-align: center;">瀹岀粨鐘舵��
+ </th>--%>
<th>鎿嶄綔
</th>
@@ -320,7 +324,7 @@
<%#Eval("City").ToString().IndexOf("鍏朵粬") >= 0 ? Eval("Province") : Eval("City")%><%#Eval("County")%>
</td>
<td>
- <a class="a_under" style="color: <%#Eval("Keyid").ToString() == Eval("MemberId").ToString() ? "" : "green"%>;" href="/Pages/financial/OrderFinancial.aspx?customeid=<%#Eval("MemberId")%>" title="鐐瑰嚮鏌ョ湅璁㈠崟璁板綍">
+ <a class="a_under" style='color: <%#Eval("Yanse") %>;' href="/Pages/financial/OrderFinancial.aspx?customeid=<%#Eval("MemberId")%>" title="鐐瑰嚮鏌ョ湅璁㈠崟璁板綍">
<%#Eval("CompanyName")%></a>
</td>
<%-- <td>
@@ -353,7 +357,12 @@
<%#Eval("NoOverOderCount")%></a>
</td>
-
+ <td>
+ <%#Eval("Weishoukuanjine", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("Yuqijine", "{0:F2}")%>
+ </td>
<td>
<%#Eval("OrderMoney", "{0:F2}")%>
</td>
@@ -363,15 +372,15 @@
<td>
<%#Eval("ContractCount").ToString() == "0" ? "脳" : "鈭�" %>
</td>
- <td>
+ <%-- <td>
<%#Eval("ShifouwanjieName")%>
- </td>
+ </td>--%>
<td style="text-align: left;" class="Operate">
<span onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
<span menu_member_case_id="case_updateCorporateClients" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
<span menu_member_case_id="case_deleteCorporateClients" menu_member_case_name="鍒犻櫎" onclick="onDelete('<%#Eval("Keyid")%>')">鍒犻櫎</span>
<span menu_member_case_id="case_setinquiryCorporateClients" menu_member_case_name="璇环璁剧疆" onclick="SetInquiryPar('<%#Eval("Keyid")%>')">璇环璁剧疆</span>
- <span menu_member_case_id="case_orderapplyCorporateClients" menu_member_case_name="璁㈠崟鍏宠仈" onclick="onChange('<%#Eval("Keyid")%>')" title="绾夸笅瀹㈡埛杞崲涓虹嚎涓婂鎴�" style="display: <%#Eval("Keyid").ToString() == Eval("MemberId").ToString() ? "inline" : "none"%>;">璁㈠崟鍏宠仈</span>
+ <%--<span menu_member_case_id="case_orderapplyCorporateClients" menu_member_case_name="璁㈠崟鍏宠仈" onclick="onChange('<%#Eval("Keyid")%>')" title="绾夸笅瀹㈡埛杞崲涓虹嚎涓婂鎴�" style="display: <%#Eval("Keyid").ToString() == Eval("MemberId").ToString() ? "inline" : "none"%>;">璁㈠崟鍏宠仈</span>--%>
<span onclick="onViewWeihu('<%#Eval("Keyid")%>')">缁存姢璁板綍</span>
<span onclick="onViewuplod('<%#Eval("Keyid")%>')" > <%#Eval("ContractCount").ToString() == "0" ? "涓婁紶鍚堝悓" : "鏌ョ湅鍚堝悓"%></span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
index a5672fb..8cb7b57 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
@@ -154,8 +154,156 @@
foreach (var item in this.RepClientList.DataSource as IEnumerable<OA_CorporateClients>)
{
item.LessOrderMoneyProperty = item.Contractmoney-item.OrderMoney;
+ var ssss = bll_eC_OrderBasicDAL.GetOrderById(item.Keyid, -1, CurrentUser.MemberId);
+ item.NoOverOderCount = ssss.Count;
+ if (ssss.Count > 0)
+ {
+ string ids = "";
- item.NoOverOderCount = bll_eC_OrderBasicDAL.GetOrderById(item.Keyid, -1, CurrentUser.MemberId).Count;
+ foreach(var c_OrderBasic in ssss)
+ {
+ ids += c_OrderBasic.Keyid + ",";
+ }
+ ids = ids.Trim(',');
+ var eC_OrderBasics = bll_eC_OrderBasicDAL.GetOrderByIds(ids);
+
+
+ item.Weishoukuanjine = eC_OrderBasics.Sum(x => x.UnPayedMoney);
+
+
+ var sssssss = item.Paytime;
+ var Paydays = item.Paydays.HasValue? item.Paydays.Value:0;
+ var Shifouwanjie = item.Shifouwanjie.HasValue ? item.Shifouwanjie.Value : 2;
+ item.Yuqijine = 0;
+ foreach (var eC_OrderBasic in eC_OrderBasics)
+ {
+ //鍒ゆ柇璁㈠崟鏄惁閫炬湡
+ var yuqi = false;
+ var ssdfsdf = eC_OrderBasic.CreateTime.Value.Date;
+
+ if(sssssss == 1)
+ {
+ // 姝ラ1锛氳幏鍙栧綋鍓嶆椂闂寸殑鈥滄湰鏈堢涓�澶┾��
+ DateTime currentMonthFirstDay = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+
+ if(ssdfsdf < currentMonthFirstDay)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 2)
+ {
+ // 姝ラ1锛氭彁鍙栨棩鏈熺殑骞翠唤鍜屾湀浠斤紙蹇界暐鏃跺垎绉掞級
+ int year = DateTime.Now.Year;
+ int month = DateTime.Now.Month;
+
+ // 姝ラ2锛氳绠楀綋鍓嶆湀浠芥墍灞炲搴︾殑璧峰鏈堜唤锛堟牳蹇冨叕寮忥級
+ // 閫昏緫锛�(鏈堜唤-1)/3 寰楀埌瀛e害绱㈠紩锛�0=Q1,1=Q2,2=Q3,3=Q4锛夛紝鍐嵜�3+1寰楀埌璧峰鏈�
+ int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+
+ // 姝ラ3锛氱粍鍚堟垚鏈搴︾涓�澶╋紙浠呮棩鏈燂紝鏃跺垎绉掍负00:00:00锛�
+ DateTime quarterFirstDay = new DateTime(year, quarterStartMonth, 1);
+ if (ssdfsdf < quarterFirstDay)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 3)
+ {
+ // 姝ラ1锛氭彁鍙栨棩鏈熺殑骞翠唤鍜屾湀浠斤紙蹇界暐鏃跺垎绉掞級
+ int year = DateTime.Now.Year;
+ int month = DateTime.Now.Month;
+
+ // 鍒ゆ柇鎵�灞炲崐骞达紝纭畾璧峰鏈堜唤
+ int halfYearStartMonth = month <= 6 ? 1 : 7;
+
+ // 缁勫悎鎴愭湰鍗婂勾绗竴澶╋紙鏃跺垎绉掗粯璁�00:00:00锛�
+ DateTime halfYearFirstDay = new DateTime(year, halfYearStartMonth, 1);
+ if (ssdfsdf < halfYearFirstDay)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 4)
+ {
+ // 姝ラ1锛氭彁鍙栨棩鏈熺殑骞翠唤鍜屾湀浠斤紙蹇界暐鏃跺垎绉掞級
+ int year = DateTime.Now.Year;
+ int month = DateTime.Now.Month;
+
+ // 鏍稿績閫昏緫锛氭彁鍙栧勾浠斤紝鐩存帴鏋勯��1鏈�1鏃�
+ DateTime yearFirstDay = new DateTime(year, 1, 1);
+
+ if (ssdfsdf < yearFirstDay)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 5)
+ {
+ // 姝ラ1锛氭彁鍙栨棩鏈熺殑骞翠唤鍜屾湀浠斤紙蹇界暐鏃跺垎绉掞級
+ int year = DateTime.Now.Year;
+ int month = DateTime.Now.Month;
+
+ DateTime semesterFirstDay;
+ if (month >= 3 && month <= 8)
+ {
+ // 3-8鏈堬細褰撳勾绗竴瀛︽湡锛岄鏃�=褰撳勾3鏈�1鏃�
+ semesterFirstDay = new DateTime(year, 3, 1);
+ }
+ else if (month >= 9 && month <= 12)
+ {
+ // 9-12鏈堬細褰撳勾绗簩瀛︽湡锛岄鏃�=褰撳勾9鏈�1鏃�
+ semesterFirstDay = new DateTime(year, 9, 1);
+ }
+ else // 1-2鏈�
+ {
+ // 1-2鏈堬細涓婁竴骞寸浜屽鏈燂紝棣栨棩=涓婁竴骞�9鏈�1鏃�
+ semesterFirstDay = new DateTime(year - 1, 9, 1);
+ }
+
+ if (ssdfsdf < semesterFirstDay)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 6)
+ {
+ if (Shifouwanjie == 1)
+ {
+ yuqi = true;
+ }
+ }
+ else if (sssssss == 7)
+ {
+ // 绗簩姝ワ細璁$畻鏃堕棿宸紝鍙朌ays灞炴�э紙宸插彇鏁达級锛岀粷瀵瑰�间繚璇佺粨鏋滀负姝�
+ TimeSpan timeSpan = DateTime.Now.Date.Subtract(ssdfsdf);
+
+ var sss = Math.Abs(timeSpan.Days);
+
+ if (sss > Paydays)
+ {
+ yuqi = true;
+ }
+ }
+
+
+
+
+ if (yuqi)
+ {
+ if (eC_OrderBasic.UnPayedMoney >= 0)
+ {
+ item.Yuqijine += eC_OrderBasic.UnPayedMoney;
+ }
+ }
+ }
+ }
+
+
+
+
+
+
Database DC = new Database();
try
{
@@ -174,8 +322,47 @@
if (DC.Connection.State != System.Data.ConnectionState.Closed)
DC.Connection.Close();
}
+ item.Yanse = "";
+ //if (item.Keyid == item.MemberId)
+ //{
+ // item.Yanse = "green";
+ //}
+ //鏈夊埌鏈熸椂闂寸殑锛屽埌鏈熷墠3涓湀鍙樻垚绾㈣壊锛堝儚浜轰簨绠$悊閭f牱锛夛紱
+ if (item.Expiretype.HasValue && item.Expiretype == 1)
+ {
+ if (item.ExpireTime.HasValue)
+ {
+ if (item.ExpireTime.Value < DateTime.Now.AddMonths(3))
+ {
+ item.Yanse = "red";
+ }
+ }
+
+ }
+
+ if (item.CreateTime.HasValue)
+ {
+ //娌℃湁鍒版湡鏃堕棿鐨勶紝浠庡缓妗f椂闂磋捣绠楋紝9涓湀鍚庡彉鎴愮孩鑹层��
+ if (item.CreateTime.Value < DateTime.Now.AddMonths(-9))
+ {
+ item.Yanse = "red";
+ }
+ //寤烘。鍚�1涓湀娌℃湁涓嬪崟锛屽彉鎴愯绾㈣壊銆�
+ if (item.CreateTime.Value < DateTime.Now.AddMonths(-1))
+ {
+ if (!item.OrderCount.HasValue || item.OrderCount.Value <= 0)
+ {
+ item.Yanse = "maroon";
+ }
+ }
+
+
+
+
+ }
+
}
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
--
Gitblit v1.9.1