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 |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 58a86b2..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)
@@ -139,7 +141,7 @@
             }
 
 
-            if (molingmoney.HasValue)
+            if (molingmoney.HasValue && molingmoney.Value > 0)
             {
                 if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                 {
@@ -169,13 +171,26 @@
                     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)
+                    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);
+                            }
                         }
                     }
 
@@ -205,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();
@@ -252,6 +262,13 @@
 
                             }
                         }
+                    }
+
+                   
+
+                    if (sddd)
+                    {
+                     
 
                         scope.Complete();
                         JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);

--
Gitblit v1.9.1