From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 (1)“印刷、打包、送货要求”放在右边的格子里面;右边格子拉通 (2)“单价”和“总价”的格子比例要调整适中 (3)把“印件名称”放在第一格 (1)操作中增加“问题处理”,进行处理操作 完成 (2)问题反馈除了生成在这个列表中,还要自动推送给对应订单的下单人或者送货安排(发起工作安排)的安排人,显示在他们的“工作提醒”中,处理完了就在列表中变成已完成问题处理,显示“√”,点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中,选“轮转印刷机”的,删除“纸张数量(张)”和“开料规格” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 3bc6298..1f835e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -29,6 +29,8 @@
OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
OA_StaffBLL oA_StaffBLL = null;
OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+ OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
+ public string DindanId = "";
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -39,6 +41,7 @@
oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
oA_StaffBLL = new OA_StaffBLL();
oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
}
//椤甸潰鍔犺浇
@@ -75,6 +78,11 @@
{
this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
this.RepClientList.DataBind();
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ DindanId = fukuanshenqing.DindanId;
+ }
}
else if (m_OA_WorkPlan.PlanDataType == 15)
{
@@ -168,19 +176,80 @@
m_OA_WorkPlan.RewardResult = staff.Name;
oA_ShebeiWeixiu.ZerenrenName = staff.Name;
}
+
+
+ if (!string.IsNullOrEmpty(this.selZerenren.Value) && !string.IsNullOrEmpty(this.txtDanzePrice.Value))
+ {
+ DateTime? RewardTime = nowTime;
+ OA_WageAwardPunish m_OA_WageAwardPunish = new OA_WageAwardPunish();
+
+ m_OA_WageAwardPunish.FirmId = CurrentUser.MemberId;
+ m_OA_WageAwardPunish.RecTitle = m_OA_WorkPlan.PlanTitle;
+ m_OA_WageAwardPunish.RecTime = nowTime;
+ m_OA_WageAwardPunish.RecType = 2;
+ m_OA_WageAwardPunish.RecContent = m_OA_WorkPlan.PlanContent;
+ m_OA_WageAwardPunish.RecMoney = this.txtDanzePrice.Value.ToDecimal2();
+ m_OA_WageAwardPunish.PlanId = 0;
+ m_OA_WageAwardPunish.LastUpdateTime = nowTime;
+ m_OA_WageAwardPunish.Operator = CurrentUser.ShortName;
+ m_OA_WageAwardPunish.MemberId = staff.MemberId;
+ m_OA_WageAwardPunish.PlanId = m_OA_WorkPlan.Keyid;
+ bll_OA_WageAwardPunishBLL.InsertModel(m_OA_WageAwardPunish);
+ }
}
+
+
if (oA_ShebeiWeixiu != null)
{
oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
-
+ oA_ShebeiWeixiu.ApprovalStatus = 1;
oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
}
+
+
+
+
+
+
}
}
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && (m_OA_WorkPlan.PlanDataType == 18))
+ {
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(m_OA_WorkPlan.Keyid, null, null);
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.ApprovalStatus = m_OA_WorkPlan.ApprovalStatus;
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+ }
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && (m_OA_WorkPlan.PlanDataType == 19))
+ {
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, m_OA_WorkPlan.Keyid, null);
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.ApprovalStatus = m_OA_WorkPlan.ApprovalStatus;
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+ }
+
+
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 2;
+ bll_OA_WageAwardPunishBLL.DeleteModel(oA_WageAward);
+ }
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 3;
+ bll_OA_WageAwardPunishBLL.UpdateShifoushensu(oA_WageAward);
+ }
+
if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15)
{//鎵瑰噯鏂板浠樻鐢宠
--
Gitblit v1.9.1