From b63e4e9f97aba58867a01b85e7d128b6eb738a0a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十月 2025 09:48:50 +0800
Subject: [PATCH] 请示类别要增加 维修申请 维修付款申请
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 67f71e4..865d732 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -25,6 +25,7 @@
OA_SuppliersBLL oA_SuppliersBLL = null;
OA_StaffBLL staffBLL = null;
OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
public WaixieExpenses()
{
@@ -38,6 +39,7 @@
oA_SuppliersBLL = new OA_SuppliersBLL();
staffBLL = new OA_StaffBLL();
oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -122,10 +124,11 @@
{
var id = this.Keyid.Value.ToInt32().Value;
var money = this.txtMoney.Value.ToDecimal2().Value;
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
var Youwufapiao = Request["rdoReceiveQuannbu"];
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
- if (fukuanshenqing.FukuanStatus == 2 && money>0)
+ if (fukuanshenqing.FukuanStatus == 2 && money > 0)
{
JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
return;
@@ -135,6 +138,16 @@
{
JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
return;
+ }
+
+
+ if (molingmoney.HasValue && molingmoney.Value > 0)
+ {
+ if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
}
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -158,7 +171,29 @@
if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
+ if(fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+ {
+ var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+ shebeiWeixiu.Shifoufufei = 1;
+ oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+ }
+
}
+
+ if (molingmoney.HasValue && molingmoney.Value > 0)
+ {
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ if (fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+ {
+ var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+ shebeiWeixiu.Shifoufufei = 1;
+ oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+ }
+ }
+ }
+
fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
@@ -185,16 +220,11 @@
firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
sddd = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
- }
-
-
- 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)
+ if (fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" && (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0))
{
//濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();
@@ -232,6 +262,13 @@
}
}
+ }
+
+
+
+ if (sddd)
+ {
+
scope.Complete();
JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);
--
Gitblit v1.9.1