From 32ad806c4d6bc5aa7aac1948e6c686696a4bbeb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 22 八月 2025 13:35:45 +0800
Subject: [PATCH] 20250822 已经安排生产的订单不允许撤单
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index 9efec7b..e9829ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -275,6 +275,41 @@
}
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_WorkPlan GetModelByFukuanshenqid(string PlanComplany, string RewardType)
+ {
+ try
+ {
+ string condi = "";
+ if (!string.IsNullOrEmpty(PlanComplany))
+ {
+ condi = " a.PlanComplany = '"+ PlanComplany + "' ";
+ }
+ else if (!string.IsNullOrEmpty(RewardType))
+ {
+ condi = " a.RewardType = '" + RewardType + "' ";
+ }
+ else
+ {
+ return null;
+ }
+
+ IList<OA_WorkPlan> result = _dataBase.SelectModel<OA_WorkPlan>(" a.* ", " OA_WorkPlan a ", condi) as IList<OA_WorkPlan>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
/// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
@@ -294,7 +329,7 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null)
+ public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null)
{
try
{
@@ -338,10 +373,14 @@
if (ApprovalStatus >= 0)
{
if (ApprovalStatus == 1)
- condition += " and ( a.ApprovalStatus = '1' or a.ApprovalStatus = '3' )";
+ condition += " and (( a.PlanDataType = 17 and a.ApprovalStatus = '1' ) or ( a.PlanDataType != 17 and (a.ApprovalStatus = '3' or a.ApprovalStatus = '1') ))";
else
condition += " and a.ApprovalStatus = '" + ApprovalStatus + "'";
}
+ if (!string.IsNullOrEmpty(BaocunStatus))
+ {
+ condition += " and a.ApprovalStatus != '" + BaocunStatus + "'";
+ }
if (EvaluationStatus >= 0)
{
if (EvaluationStatus == 5)
--
Gitblit v1.9.1