username@email.com
13 小时以前 72b668c965a3f5308d1a388296eb4c3f8fb7be72
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)
            {
                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)
                    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;
                        }
@@ -206,7 +207,7 @@
                    if(this.txtReciveMoney.Value.ToDecimal2() > 0)
                    {
                        decimal molingmoneyvalue = 0;
                        if (molingmoney.HasValue)
                        if (molingmoney.HasValue && molingmoney.Value > 0)
                        {
                            molingmoneyvalue = molingmoney.Value;
                        }
@@ -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");
                }
            }