From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index fad64df..71fd4e7 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -61,7 +61,9 @@
new SqlParameter("@PlanType", trueModel.PlanType) ,
new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
- new SqlParameter("@PlanContent", trueModel.PlanContent)
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
};
try
{
@@ -73,6 +75,71 @@
}
return true;
}
+
+
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public int InserModelAndGetId(OA_WorkPlan trueModel)
+ {
+
+ if (trueModel == null)
+ {
+ return 0;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@PlanRunTime", trueModel.PlanRunTime) ,
+ new SqlParameter("@PlanMoney", trueModel.PlanMoney) ,
+ new SqlParameter("@PlanRemark", trueModel.PlanRemark) ,
+ new SqlParameter("@PlanStartTime", trueModel.PlanStartTime) ,
+ new SqlParameter("@PlanPeople", trueModel.PlanPeople) ,
+ new SqlParameter("@PlanComplany", trueModel.PlanComplany) ,
+ new SqlParameter("@PlanStatus", trueModel.PlanStatus) ,
+ new SqlParameter("@ApprovalStaffId", trueModel.ApprovalStaffId) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus) ,
+ new SqlParameter("@ApprovalTime", trueModel.ApprovalTime) ,
+ new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@ApprovalContent", trueModel.ApprovalContent) ,
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@EvaluationStatus", trueModel.EvaluationStatus) ,
+ new SqlParameter("@EvaluationContent", trueModel.EvaluationContent) ,
+ new SqlParameter("@EvaluationStaffId", trueModel.EvaluationStaffId) ,
+ new SqlParameter("@EvaluationTime", trueModel.EvaluationTime) ,
+ new SqlParameter("@RewardType", trueModel.RewardType) ,
+ new SqlParameter("@RewardContent", trueModel.RewardContent) ,
+ new SqlParameter("@RewardResult", trueModel.RewardResult) ,
+ new SqlParameter("@SentStaffId", trueModel.SentStaffId) ,
+ new SqlParameter("@RewardMoney", trueModel.RewardMoney) ,
+ new SqlParameter("@DepartId", trueModel.DepartId) ,
+ new SqlParameter("@ReciveStaffId", trueModel.ReciveStaffId) ,
+ new SqlParameter("@PlanType", trueModel.PlanType) ,
+ new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
+ new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
+ };
+ string sql = "Insert Into OA_WorkPlan ([PlanRunTime],[PlanMoney],[PlanRemark],[PlanStartTime], [PlanPeople], [PlanComplany],[PlanStatus], [ApprovalStaffId],[ApprovalStatus], [ApprovalTime],[MemberId],[ApprovalContent],[LastUpdateTime],[Operator],EvaluationStatus,EvaluationContent,EvaluationStaffId,EvaluationTime,RewardType,RewardContent,RewardResult,SentStaffId,RewardMoney,DepartId,ReciveStaffId,PlanType,PlanDataType,PlanTitle,PlanContent,HoubufapiaoStatus,WufapiaoStatus)"
+ + " Values ( @PlanRunTime,@PlanMoney,@PlanRemark, @PlanStartTime, @PlanPeople, @PlanComplany, @PlanStatus, @ApprovalStaffId, @ApprovalStatus, @ApprovalTime,@MemberId,@ApprovalContent,@LastUpdateTime,@Operator,@EvaluationStatus,@EvaluationContent,@EvaluationStaffId,@EvaluationTime,@RewardType,@RewardContent,@RewardResult,@SentStaffId,@RewardMoney,@DepartId,@ReciveStaffId,@PlanType,@PlanDataType,@PlanTitle,@PlanContent,@HoubufapiaoStatus,@WufapiaoStatus )";
+
+ int id = 0;
+ try
+ {
+ id = _dataBase.InsertDataAndGetId(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return id;
+ }
+
+
/// <summary>
/// 淇敼
@@ -117,7 +184,9 @@
new SqlParameter("@PlanType", trueModel.PlanType) ,
new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
- new SqlParameter("@PlanContent", trueModel.PlanContent)
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
};
try
{
@@ -225,7 +294,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)
+ 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
{
@@ -248,7 +317,14 @@
}
if (PlanDataType > 0)
+ {
condition += " and a.PlanDataType = '" + PlanDataType + "'";
+ }
+ else
+ {
+ condition += " and a.PlanDataType != '17' ";
+ }
+
if (!string.IsNullOrEmpty(PlanTitle))
condition += " and a.PlanTitle like '%" + PlanTitle + "%'";
@@ -262,9 +338,13 @@
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)
{
@@ -273,6 +353,14 @@
else
condition += " and a.EvaluationStatus = '" + EvaluationStatus + "'";
}
+ if (!string.IsNullOrWhiteSpace(RewardContent))
+ {
+ condition += " and a.RewardContent like '%" + RewardContent + "%'";
+ }
+ if (!string.IsNullOrWhiteSpace(PlanContent))
+ {
+ condition += " and a.PlanContent like '%" + PlanContent + "%'";
+ }
if (RewardType > 0)
condition += " and a.RewardType = '" + RewardType + "'";
--
Gitblit v1.9.1