From d349f77523b1aa45391a36c624c849c8b9db3c49 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 18 七月 2025 09:13:22 +0800
Subject: [PATCH] 付款申请关联保证金
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx | 24 +++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 46 +++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 52 +++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx | 22 +++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs | 73 +++++++++++++++--
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx | 22 +++++
6 files changed, 224 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
index a4764d4..1c44dd6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
@@ -30,6 +30,20 @@
}
});
}
+
+
+ function ChangeThisSubject(obj) {
+
+
+ var selectedText = $(obj).find("option:selected").text();
+ if (selectedText.indexOf("鎶曟爣淇濊瘉閲�") >= 0 || selectedText.indexOf("灞ョ害淇濊瘉閲�") >= 0) {
+ $("#shenqingren").show();
+ $("#shenqingrenss").show();
+ } else {
+ $("#shenqingren").hide();
+ $("#shenqingrenss").hide();
+ }
+ }
</script>
<script type="text/javascript">
@@ -107,10 +121,16 @@
绉戠洰锛�
</td>
<td>
- <select class="Sreq" id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" style="width: 120px;" msg="璇烽�夋嫨绉戠洰">
+ <select class="Sreq" id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" style="width: 120px;" msg="璇烽�夋嫨绉戠洰" onchange="ChangeThisSubject(this);" >
</select>
</td>
</tr>
+ <tr id="shenqingrenss" style="display:none;">
+ <td colspan="2">
+ <span style="color:red;">閫夋嫨绉戠洰锛氭姇鏍囦繚璇侀噾锛屽饱绾︿繚璇侀噾锛屽皢浼氫骇鐢熶竴鏉′繚璇侀噾鏁版嵁锛�</span>
+ </td>
+
+ </tr>
<tr>
<td class="ali03 ">
鏀跺彇閲戦锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
index 830e042..0a99c4f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
@@ -29,6 +29,10 @@
OA_FirmAccountBLL bll_OA_FirmAccountBLL = null;
OA_SuppliersBLL bll_OA_SuppliersBLL = null;
OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
decimal? AllMoney = 0;
decimal? ReceiveMoney = 0;
//鍒濆鍖�
@@ -43,6 +47,10 @@
bll_OA_FirmAccountBLL = new OA_FirmAccountBLL();
bll_OA_SuppliersBLL = new OA_SuppliersBLL();
_fukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ staffBLL = new OA_StaffBLL();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
}
//椤甸潰鍔犺浇
@@ -177,16 +185,7 @@
OA_Procurement m_OA_Procurement = bll_OA_ProcurementBLL.SelectSingleModel(item);
if (m_OA_Procurement != null)
{
- if (Request["amount"].ToString2() == "one")
- m_OA_Procurement.ReceiveMoney += money;
- else
- m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney;
-
- if (m_OA_Procurement.ReceiveMoney == m_OA_Procurement.AllMoney)
- m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "缁撹处鐘舵��");
-
- m_OA_Procurement.Operator = CurrentUser.ShortName;
- m_OA_Procurement.LastUpdateTime = DateTime.Now;
+
OA_Suppliers m_OA_Suppliers = bll_OA_SuppliersBLL.getSingleSupplier(m_OA_Procurement.SuppliersId.ToString2());
@@ -208,6 +207,20 @@
m_OA_FirmAccountRecordOut.ResidualAmount = m_OA_FirmAccountOut.Balance;
m_OA_FirmAccountRecordList.Add(m_OA_FirmAccountRecordOut);
m_OA_ProcurementList.Add(m_OA_Procurement);
+
+
+
+ if (Request["amount"].ToString2() == "one")
+ m_OA_Procurement.ReceiveMoney += money;
+ else
+ m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney;
+
+ if (m_OA_Procurement.ReceiveMoney == m_OA_Procurement.AllMoney)
+ m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "缁撹处鐘舵��");
+
+ m_OA_Procurement.Operator = CurrentUser.ShortName;
+ m_OA_Procurement.LastUpdateTime = DateTime.Now;
+
}
}
@@ -215,7 +228,47 @@
if (m_OA_ProcurementList.Count > 0)
{
ssss = bll_OA_FirmAccountBLL.PurchasePayList(m_OA_FirmAccountRecordList, m_OA_ProcurementList, m_OA_FirmAccountOut);
+ if (!string.IsNullOrEmpty(this.selSubject.Value))
+ {
+ var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(m_OA_FirmAccountRecordList[0].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.selAcoountTypeOut.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 = m_OA_FirmAccountOut.AccountName + "-" + m_OA_FirmAccountOut.UserName;
+ oA_Baozhengjin.Subject = m_OA_FirmAccountRecordList[0].SubjectId;
+ oA_Baozhengjin.Fukuankemu = oA_SubjectSet.SubjectName;
+ oA_Baozhengjin.Fukuanmoney = money;
+ oA_Baozhengjin.Shoukuandanwei = m_OA_FirmAccountRecordList[0].PaymentUnit;
+ oA_Baozhengjin.remark = m_OA_FirmAccountRecordList[0].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.MemberName = fukuanshenqing.Creater;
+
+ var oA_Staff = staffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.Name == oA_Baozhengjin.MemberName).FirstOrDefault();
+ oA_Baozhengjin.MemberId = oA_Staff.Keyid;
+
+ var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+ }
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
index 75fbcd8..61cf117 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
@@ -129,9 +129,15 @@
绉戠洰鍚嶇О锛�
</td>
<td>
- <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+ <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О" onchange="ChangeThisSubject(this);" >
</select>
</td>
+ </tr>
+ <tr id="shenqingrenss" style="display:none;">
+ <td colspan="2">
+ <span style="color:red;">閫夋嫨绉戠洰锛氭姇鏍囦繚璇侀噾锛屽饱绾︿繚璇侀噾锛屽皢浼氫骇鐢熶竴鏉′繚璇侀噾鏁版嵁锛�</span>
+ </td>
+
</tr>
<tr>
@@ -192,8 +198,22 @@
}
});
}
+
+
+ function ChangeThisSubject(obj) {
+
+
+ var selectedText = $(obj).find("option:selected").text();
+ if (selectedText.indexOf("鎶曟爣淇濊瘉閲�") >= 0 || selectedText.indexOf("灞ョ害淇濊瘉閲�") >= 0) {
+ $("#shenqingren").show();
+ $("#shenqingrenss").show();
+ } else {
+ $("#shenqingren").hide();
+ $("#shenqingrenss").hide();
+ }
+ }
- </script>
+ </script>
<script type="text/javascript">
$(function () {
ChangeThisType("#selAcoountType");
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index 8f308a6..1a4679f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -28,6 +28,10 @@
OA_FirmAccount firmAccount = null;
OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
string orderNo = string.Empty;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
decimal? AllMoney = 0;
decimal? ReceiveMoney = 0;
@@ -42,6 +46,10 @@
firmAccountRecord = new OA_FirmAccountRecord();
_OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
_fukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ staffBLL = new OA_StaffBLL();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
}
/// <summary>
@@ -190,6 +198,8 @@
ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
if (ssss)
{
+
+
UsePrepare(orderBasic);
@@ -203,6 +213,48 @@
}
}
+
+ 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 = 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.MemberName = fukuanshenqing.Creater;
+
+ var oA_Staff = staffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.Name == oA_Baozhengjin.MemberName).FirstOrDefault();
+ oA_Baozhengjin.MemberId = oA_Staff.Keyid;
+
+ var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+ }
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
index 5e5dfeb..1fb4f99 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
@@ -60,9 +60,15 @@
绉戠洰鍚嶇О锛�
</td>
<td>
- <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+ <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О" onchange="ChangeThisSubject(this);" >
</select>
</td>
+ </tr>
+ <tr id="shenqingrenss" style="display:none;">
+ <td colspan="2">
+ <span style="color:red;">閫夋嫨绉戠洰锛氭姇鏍囦繚璇侀噾锛屽饱绾︿繚璇侀噾锛屽皢浼氫骇鐢熶竴鏉′繚璇侀噾鏁版嵁锛�</span>
+ </td>
+
</tr>
<tr>
<td class="ali03 ">
@@ -148,7 +154,19 @@
}
});
}
-
+
+ function ChangeThisSubject(obj) {
+
+
+ var selectedText = $(obj).find("option:selected").text();
+ if (selectedText.indexOf("鎶曟爣淇濊瘉閲�") >= 0 || selectedText.indexOf("灞ョ害淇濊瘉閲�") >= 0) {
+ $("#shenqingren").show();
+ $("#shenqingrenss").show();
+ } else {
+ $("#shenqingren").hide();
+ $("#shenqingrenss").hide();
+ }
+ }
</script>
<script type="text/javascript">
$(function () {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index d7b231c..67f71e4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -23,6 +23,8 @@
OA_FirmAccount firmAccount = null;
OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
OA_SuppliersBLL oA_SuppliersBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
public WaixieExpenses()
{
@@ -34,6 +36,8 @@
firmAccountRecord = new OA_FirmAccountRecord();
_fukuanshenqingBLL = new OA_FukuanshenqingBLL();
oA_SuppliersBLL = new OA_SuppliersBLL();
+ staffBLL = new OA_StaffBLL();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -187,6 +191,48 @@
if (sddd)
{
+ 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.MemberName = fukuanshenqing.Creater;
+
+ var oA_Staff = staffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.Name == oA_Baozhengjin.MemberName).FirstOrDefault();
+ oA_Baozhengjin.MemberId = oA_Staff.Keyid;
+
+ var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+ }
+ }
+
scope.Complete();
JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);
}
--
Gitblit v1.9.1