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.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
index 0530a34..16f5a04 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
@@ -14,6 +14,7 @@
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.BLL.OA;
namespace CY.WebForm.Pages.work
{
@@ -31,6 +32,7 @@
OA_StaffBLL oA_StaffBLL = null;
OA_DepartmentBll oA_DepartmentBll = null;
public string planDataType = "";
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
public BaoxiaoReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -42,6 +44,7 @@
oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
oA_StaffBLL = new OA_StaffBLL();
oA_DepartmentBll = new OA_DepartmentBll();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
}
//椤甸潰鍔犺浇
@@ -56,6 +59,11 @@
//鏁版嵁鍔犺浇
public void InitData()
{
+ //绉戠洰鍚嶇О
+ this.selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ this.selSubject.DataBind();
+ // this.selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
if (m_OA_WorkPlan != null)
{
@@ -68,10 +76,10 @@
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
- this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
+ this.txtPlanMoney.Value = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
- this.spanSubject.InnerText = m_OA_WorkPlan.RewardContent.ToString();
- this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.selSubject.Value = m_OA_WorkPlan.RewardResult;
+ this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent;
this.spanHoubufapiaoStatus.InnerText = m_OA_WorkPlan.HoubufapiaoStatusName;
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
@@ -124,6 +132,11 @@
if (m_OA_WorkPlan.ApprovalStatus == 1 || m_OA_WorkPlan.ApprovalStatus == 2)
{
JavaScript.MessageBox("璇ユ姤閿�宸茬粡瀹℃壒瀹屾垚", this);
+ return;
+ }
+ if (m_OA_WorkPlan.PlanMoney< this.txtPlanMoney.Value.ToDecimal2())
+ {
+ JavaScript.MessageBox("淇敼鍚庣殑鎶ラ攢閲戦涓嶈兘澶т簬鍘熸姤閿�閲戦", this);
return;
}
var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value).ToList();
@@ -185,7 +198,15 @@
}
}
+ m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.ToDecimal2();
+ m_OA_WorkPlan.RewardResult = this.selSubject.Value;
+ m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value;
+ var a_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(this.selSubject.Value.ToInt32());
+ if (a_SubjectSet != null)
+ {
+ m_OA_WorkPlan.RewardContent = a_SubjectSet.SubjectName;
+ }
DateTime nowTime = DateTime.Now;
@@ -222,6 +243,10 @@
m_OA_WorkPlan.LastUpdateTime = nowTime;
res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
}
+ else
+ {
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
--
Gitblit v1.9.1