From 72b668c965a3f5308d1a388296eb4c3f8fb7be72 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 九月 2025 08:46:01 +0800
Subject: [PATCH] 批量入库，操作成功关闭窗口 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index 4d3c0ca..3f5f149 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -152,11 +152,11 @@
return;
}
- if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
- {
- JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
- return;
- }
+ //if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ //{
+ // JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
+ // return;
+ //}
var Youwufapiao = Request["rdoReceiveQuannbu"];
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -165,14 +165,14 @@
return;
}
- if (molingmoney.HasValue && molingmoney.Value > 0)
- {
- if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
- {
- JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
- return;
- }
- }
+ //if (molingmoney.HasValue && molingmoney.Value > 0)
+ //{
+ // if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ // {
+ // JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ // return;
+ // }
+ //}
string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
@@ -185,15 +185,16 @@
{
try
{
+ var sss = fukuanshenqing.Molingmoney.HasValue ? fukuanshenqing.Molingmoney.Value : 0;
var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
- if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ if (money >= (fukuanshenqing.Fukuanmoney + sss - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
if (molingmoney.HasValue && molingmoney.Value > 0)
{
- if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney + sss - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
@@ -304,7 +305,7 @@
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);
+ var aaaaa = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
}
}
@@ -422,6 +423,11 @@
this.hidReceiveMoney.Value = ReceiveMoney.Value.ToString();
this.txtReciveMoney.Value = ReceiveMoney.Value.ToString("0.00");
this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
+ this.txtMolingMoney.Value = fukuanshenqing.Molingmoney.HasValue? fukuanshenqing.Molingmoney.Value.ToString("0.00"):"0";
+ if (fukuanshenqing.Molingmoney.HasValue)
+ {
+ this.txtReciveMoney.Value = (ReceiveMoney.Value - fukuanshenqing.Molingmoney.Value).ToString("0.00");
+ }
}
--
Gitblit v1.9.1