From 1df19350ea2786c4307060ad247862578ab7e3dc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 14:49:01 +0800
Subject: [PATCH] 设计订单删除重新写

---
 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index ef60b10..77c263d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -48,6 +48,7 @@
         OA_CarManageBll bll_OA_CarManageBll = null;
         OA_PropertyCateBLL bll_OA_PropertyCateBLL = null;
         OA_PropertyManageBLL bll_OA_PropertyManageBLL = null;
+        OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
         OA_StaffPostBLL bll_OA_StaffPostBLL = null;
         OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
         OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
@@ -90,6 +91,7 @@
             bll_OA_CarManageBll = new OA_CarManageBll();
             bll_OA_PropertyCateBLL = new OA_PropertyCateBLL();
             bll_OA_PropertyManageBLL = new OA_PropertyManageBLL();
+            bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
             bll_OA_StaffPostBLL = new OA_StaffPostBLL();
             bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
             bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
@@ -241,6 +243,10 @@
             else if (Request["dateType"] == "propertyNamecheckname")
             {
                 Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
+            }
+            else if (Request["dateType"] == "shebeiNamecheckname")
+            {
+                Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
             }
             else if (Request["dateType"] == "resumeCateChange")
             {
@@ -1424,6 +1430,22 @@
 
         #endregion
 
+
+        #region 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+
+        /// <summary>
+        /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+        /// </summary>
+        /// <param name="Name"></param>
+        /// <param name="Keyid"></param>
+        /// <returns></returns>
+        public int IsExitsShebeiNameCateName(string Name, string Keyid)
+        {
+            return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+        }
+
+        #endregion
+
         #region 鏍规嵁鑱屼綅绫诲埆鑾峰彇鍏ㄩ儴鑱屼綅
 
         public string GetPostListByCateId(int? cateId, int? Num)
@@ -1684,12 +1706,11 @@
             OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
             DateTime? calculateTimeStart = (calculateTimeString.Replace("骞�", "-").Replace("鏈�", "-") + "1").ToDateTime2();
             DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
-
             //濂栧姳鍜岀綒娆�
             Pagination pa = new Pagination();
             pa.PageSize = 500;
             pa.PageIndex = 1;
-            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
+            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
             if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
             {
                 m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;

--
Gitblit v1.9.1