From 2a8f5dfa8bfa910829d057d6ba76778aa12880ca Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 十月 2025 08:46:24 +0800
Subject: [PATCH] 20251028 收款提醒修改 完成未发布 20251028 作业本详情样式修改 完成未发布
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx | 2
CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs | 8 ++++
CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs | 14 ++++++-
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 8 ++--
CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs | 12 ++++++
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 10 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs | 8 +++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs | 27 +++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx | 2
10 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs
index f7abfcf..089ad7e 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs
@@ -88,6 +88,18 @@
return _IOA_CuikuanjiluDAL.GetModelByKeyid( BuyerId, shoukuanshijian);
}
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "")
+ {
+
+ return _IOA_CuikuanjiluDAL.GetCountByKeyid(BuyerId, shoukuanshijian);
+ }
+
/// <summary>
/// 鍒犻櫎鍚堜綔瀹㈡埛
/// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs
index 0ab5a81..cd017a0 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs
@@ -18,5 +18,13 @@
/// <param name="Keyid">缂栧彿</param>
/// <returns></returns>
IEnumerable<OA_Cuikuanjilu> GetModelByKeyid( Guid? BuyerId, string shoukuanshijian = "");
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "");
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs
index 5aa6584..7f2bf84 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs
@@ -72,6 +72,12 @@
set;
}
+ public int? Count
+ {
+ get;
+ set;
+ }
+
#endregion Model
#region Visiter
@@ -145,8 +151,12 @@
this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
theValue = this.LastUpdateTime;
}
-
-
+ else if ("Count".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+ {
+ this.Count = isChange ? MyConvert.ConvertToInt32(value) : Count;
+ theValue = this.Count;
+ }
+
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 1aa25b2..be3745d 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -347,6 +347,16 @@
set;
}
+
+ /// <summary>
+ /// 鍌璁板綍
+ /// </summary>
+ public string Cuikuanjilu
+ {
+ get;
+ set;
+ }
+
/// <summary>
/// 鏈粯娆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs
index 202ec6b..562341e 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs
@@ -130,6 +130,33 @@
/// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "")
+ {
+ try
+ {
+ string condition = " ";
+
+ condition = " BuyerId='" + BuyerId + "' and shoukuanshijian='" + shoukuanshijian + "'";
+
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_Cuikuanjilu> result = _dataBase.SelectModel<OA_Cuikuanjilu>(" count(*) as Count ", "OA_Cuikuanjilu", condition) as IList<OA_Cuikuanjilu>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? 0 : result[0].Count.Value;//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
/// 鍏ㄩ儴鏌ヨ
/// </summary>
/// <param name="query"></param>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
index 2589881..c24604b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
@@ -10,7 +10,7 @@
//涓撶増鏂藉伐
function specialOrder(orderid, num) {
if (num == "has") {
- top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "涓撶増鏂藉伐", Width: 1100, Height: 700 });
+ top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "涓撶増鏂藉伐", Width: 1100, Height: 780 });
}
}
//鏁村崟澶栧崗
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
index 72c34b7..49a2e82 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
@@ -14,7 +14,7 @@
}
//缂栬緫鏂藉伐鍗�
function EditModel(orderid) {
- top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "缂栬緫鏂藉伐鍗�", Width: 1100, Height: 700 });
+ top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "缂栬緫鏂藉伐鍗�", Width: 1100, Height: 780 });
}
//鍒犻櫎
function onDelete(keyid) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx
index ceab4a0..7b22559 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx
@@ -197,7 +197,7 @@
</td>
<td menu_member_case_id="case_Cuikuanjilu" menu_member_case_name="鍌璁板綍" >
- <a href='javascript:void(0)' title='鐐瑰嚮娣诲姞鍌璁板綍' class='a_under' onclick='ViewCuikuanjilu("<%#Eval("BuyerId")%>","<%#Eval("shoukuanshijian")%>")'> 鏌ョ湅璁板綍 </a>
+ <a href='javascript:void(0)' title='鐐瑰嚮娣诲姞鍌璁板綍' class='a_under' onclick='ViewCuikuanjilu("<%#Eval("BuyerId")%>","<%#Eval("shoukuanshijian")%>")'> <%#Eval("Cuikuanjilu") %> </a>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs
index f2dd3be..81446b5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs
@@ -28,6 +28,7 @@
EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
EC_OrderBLL eC_OrderBLL = null;
+ OA_CuikuanjiluBLL oA_CuikuanjiluBLL = null;
//鍒濆鍖�
@@ -41,6 +42,7 @@
bll_EC_MemberBasicBLL = new EC_MemberBasicBLL();
bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
eC_OrderBLL = new EC_OrderBLL();
+ oA_CuikuanjiluBLL = new OA_CuikuanjiluBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -118,8 +120,12 @@
this.selBusinessManagerId.Value,
this.selAccountManagerId.Value);
-
+ foreach (var oA_DeliverPlan in oA_DeliverPlans1)
+ {
+ var ddd = oA_CuikuanjiluBLL.GetCountByKeyid(oA_DeliverPlan.BuyerId, oA_DeliverPlan.shoukuanshijian);
+ oA_DeliverPlan.Cuikuanjilu = ddd.ToString();
+ }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index babf137..fab81c8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -689,9 +689,9 @@
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗曚环</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閲戦</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">灏侀潰绾稿紶</td>";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+ //printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍐呰姱绾稿紶</td>";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+ //printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">椤电爜</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">瑁呰</td>";
printDemand += "</tr>";
@@ -837,7 +837,7 @@
inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
}
//printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
+ // printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
}
if (request["WorkBookNeiXinga" + (i + 1)] != null)
@@ -861,7 +861,7 @@
inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
}
//printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
- printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
+ // printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
}
if (request["WorkBookpageNuma" + (i + 1)] != null)
--
Gitblit v1.9.1