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/financial/FirmAccountExpensesEdit.aspx.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
index ca7ca90..1c8fcd6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
@@ -8,6 +8,7 @@
using CY.Infrastructure.Common;
using CY.BLL.OA;
using CY.BLL.Sys;
+using CY.BLL;
namespace CY.WebForm.Pages.financial
{
@@ -19,7 +20,8 @@
OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
OA_FirmAccountRecord firmAccountRecord = null;
OA_FirmAccount firmAccount = null;
-
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_StaffBLL staffBLL = null;
public FirmAccountExpensesEdit()
{
firmAccount = new OA_FirmAccount();
@@ -28,6 +30,8 @@
_OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
_OA_SubjectSetBLL = new OA_SubjectSetBLL();
firmAccountRecord = new OA_FirmAccountRecord();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ staffBLL = new OA_StaffBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -68,6 +72,9 @@
///璐︽埛绫诲瀷
selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
selAcoountType.DataBind();
+
+ selshenqingren.DataSource = staffBLL.SelectListByFirmId(CurrentUser.MemberId,null, null).Where(x => x.DepartmentId == 2);
+ selshenqingren.DataBind();
}
protected string reLoadAccountName(string selAcoountType)
@@ -79,6 +86,8 @@
{
try
{
+ // selshenqingren
+
firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
@@ -98,6 +107,53 @@
if (_OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount))
{
+ if (!string.IsNullOrEmpty(this.selSubject.Value))
+ {
+ var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
+ if (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0)
+ {
+ //濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
+ OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();
+ oA_Baozhengjin.FirmId = CurrentUser.MemberId;
+ oA_Baozhengjin.FukuanTime = DateTime.Now;
+
+ oA_Baozhengjin.Zhanghuleixing = this.selAcoountType.Value;
+
+ var ss = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷").FirstOrDefault(x => x.Name == oA_Baozhengjin.Zhanghuleixing);
+ if (ss != null)
+ {
+ oA_Baozhengjin.ReceiveWay = ss.Keyid;
+ }
+
+ oA_Baozhengjin.Account = Request["selAccountName"].ToInt32();
+ oA_Baozhengjin.Fukuanzhanghu = firmAccount.AccountName + "-" + firmAccount.UserName;
+ oA_Baozhengjin.Subject = firmAccountRecord.SubjectId;
+ oA_Baozhengjin.Fukuankemu = oA_SubjectSet.SubjectName;
+ oA_Baozhengjin.Fukuanmoney = firmAccountRecord.Money;
+ oA_Baozhengjin.Shoukuandanwei = firmAccountRecord.PaymentUnit;
+ oA_Baozhengjin.remark = firmAccountRecord.OperationalMatters;
+ oA_Baozhengjin.TuikuanTime = null;
+
+ oA_Baozhengjin.TuikuanStatus = 1;
+ oA_Baozhengjin.Creater = CurrentUser.ShortName;
+ oA_Baozhengjin.CreateTime = oA_Baozhengjin.FukuanTime;
+ oA_Baozhengjin.Updater = CurrentUser.ShortName;
+ oA_Baozhengjin.LastUpdateTime = oA_Baozhengjin.FukuanTime;
+ oA_Baozhengjin.MemberId = this.selshenqingren.Value.ToInt32();
+ if(oA_Baozhengjin.MemberId.HasValue && oA_Baozhengjin.MemberId.Value > 0)
+ {
+ var aaa = staffBLL.GetModelByKeyid(oA_Baozhengjin.MemberId);
+ if (aaa != null)
+ {
+ oA_Baozhengjin.MemberName = aaa.Name;
+ }
+ }
+
+ var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+ }
+ }
+
this.selSubject.Value = "";
this.txtMoney.Value = "";
this.txtDepartment.Value = "";
--
Gitblit v1.9.1