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/OA_DocumentAdd.aspx.cs | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
index 69faa27..337748d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
@@ -57,6 +57,26 @@
this.txtDM_DocumentType.Value = "";
this.txtDM_Number.Value = "";
this.txtDM_DocumentNumber.InnerHtml = "";
+
+ if (!string.IsNullOrEmpty(Request["keyid"]))
+ {
+ OA_Document m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_Document != null)
+ {
+ this.txtDM_Title.Value = m_OA_Document.DM_Title.ToString2(); ;
+ this.txtDM_Content.Text = m_OA_Document.DM_Content;
+ this.txtDM_ThemeWords.Value = m_OA_Document.DM_ThemeWords;
+ this.txtDM_CCUnit.Text = m_OA_Document.DM_CCUnit;
+ this.txtDM_PrintNumber.Value = m_OA_Document.DM_PrintNumber.HasValue ? m_OA_Document.DM_PrintNumber.Value.ToString() : "";
+ this.txtDM_PostingId.SelectedValue = m_OA_Document.DM_PostingId.HasValue ? m_OA_Document.DM_PostingId.Value.ToString() : "";
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ this.txtDM_PostingFirmName.InnerHtml = m_OA_DocumentDic.ParName;
+ this.txtDM_DocumentType.Value = m_OA_Document.DM_DocumentType;
+ this.txtDM_Number.Value = m_OA_Document.DM_Number.HasValue ? m_OA_Document.DM_Number.Value.ToString() : "";
+ this.txtDM_DocumentNumber.InnerHtml = m_OA_Document.DM_DocumentNumber;
+ }
+ }
+
}
//琛ㄥ崟鎻愪氦
@@ -66,36 +86,75 @@
{
DateTime nowTime = DateTime.Now;
OA_Document m_OA_Document = new OA_Document();
- m_OA_Document.FirmId = CurrentUser.MemberId;
- m_OA_Document.DM_PromulgatedDate = nowTime;
- m_OA_Document.DM_DelTime = nowTime;
- m_OA_Document.DM_PrintTime = nowTime;
- m_OA_Document.DM_PrintStatus = 1;
- m_OA_Document.DM_Status = 1;
- OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
- m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
- m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
- m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
- m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
- m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
- m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
- m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
- m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
- m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
- m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
- m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
- m_OA_Document.LastUpdateTime = nowTime;
- m_OA_Document.Operator = CurrentUser.ShortName;
-
-
- if (bll_OA_DocumentBLL.InsertModel(m_OA_Document))
+ if (!string.IsNullOrEmpty(Request["keyid"]))
{
- JavaScript.MessageBox("鏂板鎴愬姛", this, false, true);
- InitData();
+ m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ m_OA_Document.FirmId = CurrentUser.MemberId;
+ m_OA_Document.DM_PromulgatedDate = nowTime;
+ m_OA_Document.DM_DelTime = nowTime;
+ m_OA_Document.DM_PrintTime = nowTime;
+ m_OA_Document.DM_PrintStatus = 1;
+ m_OA_Document.DM_Status = 1;
+
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
+ m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
+ m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
+ m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
+ m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
+ //m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
+ m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
+ m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
+ m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
+ m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
+ m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
+ m_OA_Document.LastUpdateTime = nowTime;
+ m_OA_Document.Operator = CurrentUser.ShortName;
+
+
+ if (bll_OA_DocumentBLL.UpdateModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("淇敼鎴愬姛", this, true, true);
+ //InitData();
+ }
+ else
+ JavaScript.MessageBox("淇敼澶辫触", this);
}
else
- JavaScript.MessageBox("鏂板澶辫触", this);
+ {
+ m_OA_Document.FirmId = CurrentUser.MemberId;
+ m_OA_Document.DM_PromulgatedDate = nowTime;
+ m_OA_Document.DM_DelTime = nowTime;
+ m_OA_Document.DM_PrintTime = nowTime;
+ m_OA_Document.DM_PrintStatus = 1;
+ m_OA_Document.DM_Status = 1;
+
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
+ m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
+ m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
+ m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
+ m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
+ m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
+ m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
+ m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
+ m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
+ m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
+ m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
+ m_OA_Document.LastUpdateTime = nowTime;
+ m_OA_Document.Operator = CurrentUser.ShortName;
+
+
+ if (bll_OA_DocumentBLL.InsertModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("鏂板鎴愬姛", this, false, true);
+ InitData();
+ }
+ else
+ JavaScript.MessageBox("鏂板澶辫触", this);
+ }
+
}
catch (Exception ex)
--
Gitblit v1.9.1