From 58cc59639e3ca32896d6db5d0c261ff63848a30d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 15 九月 2025 15:04:37 +0800
Subject: [PATCH] 增加一个完结时间，如果下次打开，就按完结时间计算合同金额
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs | 2
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 18 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 6 +-
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 12 ++--
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs | 58 +++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 4
CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs | 9 +++
CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs | 16 +++++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 2
11 files changed, 118 insertions(+), 17 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
index 74d9ec5..ab4c1e0 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
@@ -85,6 +85,24 @@
}
}
+
+ /// <summary>
+ /// 淇敼鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateWanjie(CY.Model.OA_CorporateClients m_OA_CorporateClients)
+ {
+ try
+ {
+ return _IOA_CorporateClientsDal.UpdateWanjie(m_OA_CorporateClients);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
/// <summary>
/// 璁剧疆鑷姩澶栧崗
/// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
index 894127e..08bb28c 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
@@ -389,5 +389,14 @@
/// <returns></returns>
OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid);
+
+
+ /// <summary>
+ /// 淇敼瀹岀粨
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ bool UpdateWanjie(Infrastructure.Domain.IAggregateRoot model);
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
index 4415ba6..19cb69e 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
@@ -520,6 +520,17 @@
return _lastupdatetime;
}
}
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public DateTime? WanjieTime
+ {
+ set;
+ get;
+
+ }
+
/// <summary>
/// 鎿嶄綔浜�
/// </summary>
@@ -1555,6 +1566,11 @@
this.JieJiaRiWiHu = isChange ? MyConvert.ConvertToBoolean(value) : JieJiaRiWiHu;
theValue = this.JieJiaRiWiHu;
}
+ else if ("WanjieTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 85)
+ {
+ this.WanjieTime = isChange ? MyConvert.ConvertToDateTime(value) : WanjieTime;
+ theValue = this.WanjieTime;
+ }
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index d7a3f34..624a1f1 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -1580,7 +1580,7 @@
left join [Sys_Dictionary] expiretype on expiretype.DicType='鍒版湡鏃堕棿' and expiretype.MeanValue = oc.Expiretype
left join ( select ob.BuyerId,sum(ob.SumPrice) SumPrice,sum(ts.PayedMoney) PayedMoney ,COUNT(*) as shuliang
from EC_OrderBasic ob Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId)
- left join EC_AwbInfo ea on ob.Keyid = ea.Keyid
+ left join EC_AwbInfo ea on ob.Keyid = ea.Keyid Inner Join OA_CorporateClients occ on ob.BuyerId = occ.Keyid where (occ.WanjieTime IS NULL OR DATEDIFF(DAY,occ.WanjieTime,ob.CreateTime)>=0)
group by ob.BuyerId ) ob on oc.Keyid = ob.BuyerId
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
index cc7171c..cc4b2cf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
@@ -265,6 +265,64 @@
return true;
}
+
+
+ /// <summary>
+ /// 淇敼瀹岀粨
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateWanjie(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_CorporateClients trueModel = model as Model.OA_CorporateClients;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ SqlParameter par = null;
+ if (trueModel.LastOrderTime.HasValue)
+ {
+ par = new SqlParameter("@LastOrderTime", trueModel.LastOrderTime.Value);
+ }
+ else
+ {
+ par = new SqlParameter("@LastOrderTime", DBNull.Value);
+ }
+ SqlParameter par1 = null;
+ if (trueModel.WanjieTime.HasValue)
+ {
+ par1 = new SqlParameter("@WanjieTime", trueModel.WanjieTime.Value);
+ }
+ else
+ {
+ par1 = new SqlParameter("@WanjieTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid),
+
+ par,
+
+ par1,
+
+ new SqlParameter("@Shifouwanjie",trueModel.Shifouwanjie??0) ,
+ };
+ string sql = "Update [OA_CorporateClients] Set [Shifouwanjie]=@Shifouwanjie,[WanjieTime]=@WanjieTime,[LastOrderTime]=@LastOrderTime where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
/// <summary>
/// 杞Щ瀹㈡埛
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
index 6fd403e..d5823cd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -277,8 +277,8 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.PlanComplany = id.ToString();
- m_OA_WorkPlan.PlanContent = orderNoStr + " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;
- m_OA_WorkPlan.PlanDataType = 16;
+ m_OA_WorkPlan.PlanContent = " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;//+ orderNoStr
+ m_OA_WorkPlan.PlanDataType = 16;
m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index b9d27d6..c93236b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -360,14 +360,14 @@
m_OA_CorporateClients.Shifouwanjie = 1;
m_OA_CorporateClients.LastUpdateTime = DateTime.Now;
+ m_OA_CorporateClients.WanjieTime = DateTime.Now;
-
- #region 娣诲姞鎴栫紪杈�
+ #region 娣诲姞鎴栫紪杈�
-
- bool result = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);//鏇存柊淇℃伅
+
+ bool result = bll_OA_CorporateClientsBLL.UpdateWanjie(m_OA_CorporateClients);//鏇存柊淇℃伅
if (result)
JavaScript.MessageBox("瀹岀粨鎴愬姛", this, true, true);
else
@@ -413,13 +413,13 @@
m_OA_CorporateClients.LastUpdateTime = DateTime.Now;
-
+ m_OA_CorporateClients.WanjieTime = DateTime.Now;
#region 娣诲姞鎴栫紪杈�
- bool result = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);//鏇存柊淇℃伅
+ bool result = bll_OA_CorporateClientsBLL.UpdateWanjie(m_OA_CorporateClients);//鏇存柊淇℃伅
if (result)
JavaScript.MessageBox("瀹岀粨鎴愬姛", this, true, true);
else
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
index a0b5e16..721d5c7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -270,7 +270,7 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.PlanComplany = id.ToString();
- m_OA_WorkPlan.PlanContent = orderNoStr + "锛岃鍗曢噾棰濓細" + this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + "銆�" ;
+ m_OA_WorkPlan.PlanContent = "璁㈠崟閲戦锛�" + this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + ","+ orderNoStr +"銆�" ;
m_OA_WorkPlan.PlanDataType = 14;
m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index 3f5f149..62fc632 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -245,10 +245,10 @@
firmAccountRecord.RecordTypeId = 2;//鏀嚭
firmAccountRecord.Remark = this.txtRemark.Value;
firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
- firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
+ firmAccountRecord.ResidualAmount = firmAccount.Balance - firmAccountRecord.Money; ;
- firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
- firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
+ firmAccount.AllExpenses = firmAccountRecord.Money + firmAccount.AllExpenses;
+ firmAccount.Balance = firmAccount.Balance - firmAccountRecord.Money;
ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
if (ssss)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index 729d441..72a2f94 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -150,7 +150,7 @@
<th width="70" style="text-align: center">
璇风ず绫诲埆
</th>
- <th width="300" style="text-align: center">
+ <th style="text-align: center">
璇风ず鍐呭
</th>
<th width="70" style="text-align: center">
@@ -182,7 +182,7 @@
<%#Eval("PlanDataTypeName")%>
</td>
<td style="text-align: center">
- <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
+ <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>
</td>
<td style="text-align: center">
<%#Eval("PlanMoney", "{0:F2}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 546232f..dacabcf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -116,7 +116,7 @@
<th width="70" style="text-align: center">
璇风ず绫诲埆
</th>
- <th width="300" style="text-align: center">
+ <th style="text-align: center">
璇风ず鍐呭
</th>
<th width="70" style="text-align: center">
@@ -148,7 +148,7 @@
<%#Eval("PlanDataTypeName")%>
</td>
<td style="text-align: center">
- <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
+ <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>
</td>
<td style="text-align: center">
--
Gitblit v1.9.1