username@email.com
2 天以前 879b9eaa07c8f3e5340bfd7cac565780b9d2867c
采购付款抹零
7个文件已修改
186 ■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx.cs 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx.designer.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
@@ -143,7 +143,7 @@
                收取金额:
            </td>
            <td  title="当单个付款时可部分付款">
                <input  runat="server"  id="txtReciveMoney"  class="req float" maxlength="18" min="0" readonly="readonly" ></input>
                <input  runat="server"  id="txtReciveMoney"  class="req float" maxlength="18" min="0" readonly="readonly" />
            </td>
        </tr>
        <tr>
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
@@ -165,7 +165,7 @@
                            return;
                        }
                        if (molingmoney.HasValue)
                        if (molingmoney.HasValue && molingmoney.Value > 0)
                        {
                            if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                            {
@@ -191,7 +191,7 @@
                                {
                                    fukuanshenqing.FukuanStatus = 2;
                                }
                                if (molingmoney.HasValue)
                                if (molingmoney.HasValue && molingmoney.Value > 0)
                                {
                                    if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                                    {
@@ -210,7 +210,7 @@
                                    m_OA_FirmAccountOut.Balance -= money;
                                    m_OA_FirmAccountOut.AllExpenses += money;
                                    decimal molingmoneyvalue = 0;
                                    if (molingmoney.HasValue)
                                    if (molingmoney.HasValue && molingmoney.Value > 0)
                                    {
                                        molingmoneyvalue = molingmoney.Value;
                                    }
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -165,7 +165,7 @@
                return;
            }
            if (molingmoney.HasValue)
            if (molingmoney.HasValue && molingmoney.Value > 0)
            {
                if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                {
@@ -191,7 +191,7 @@
                    {
                        fukuanshenqing.FukuanStatus = 2;
                    }
                    if (molingmoney.HasValue)
                    if (molingmoney.HasValue && molingmoney.Value > 0)
                    {
                        if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                        {
@@ -206,7 +206,7 @@
                    if(this.txtReciveMoney.Value.ToDecimal2() > 0)
                    {
                        decimal molingmoneyvalue = 0;
                        if (molingmoney.HasValue)
                        if (molingmoney.HasValue && molingmoney.Value > 0)
                        {
                            molingmoneyvalue = molingmoney.Value;
                        }
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx
@@ -30,7 +30,13 @@
                }
            });
        }
        function molinya() {
            var sss = $("#hidReceiveMoney").val() - $("#txtMolingMoney").val()
            $("#txtReciveMoney").val(sss);
        }
    </script>
    <script type="text/javascript">
        $(function () {
@@ -72,6 +78,7 @@
            </td>
            <td>
                <span class="moneystyle" id="spanReceiveMoney" runat="server">¥</span>
                 <input type="hidden" id="hidReceiveMoney"  runat="server" />
            </td>
        </tr>
        <tr>
@@ -107,9 +114,17 @@
                收取金额:
            </td>
            <td  title="当单个付款时可部分付款">
                <asp:TextBox TextMode="SingleLine"  id="txtReciveMoney" runat="server" class="req float" min="0"></asp:TextBox>
               <input  runat="server"  id="txtReciveMoney"  class="req float" maxlength="18" min="0"  />
            </td>
        </tr>
         <tr>
                <td class="ali03 ">
                    抹零金额:
                </td>
                <td>
                    <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" onchange="molinya();" />(元)
                </td>
            </tr>
        <tr>
            <td class="ali03">
            </td>
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx.cs
@@ -81,10 +81,11 @@
            {
                this.spanAllMoney.InnerHtml = "¥" + (AllMoney ?? 0).ToString("0.00");
                this.spanReceiveMoney.InnerHtml = "¥" + (ReceiveMoney ?? 0).ToString("0.00");
                this.hidReceiveMoney.Value = (ReceiveMoney ?? 0).ToString("0.0000");
                this.spanCountRe.InnerHtml = "1 单";
                this.txtReciveMoney.Enabled = true;
                this.txtReciveMoney.Text = (ReceiveMoney ?? 0).ToString("0.00");
                this.txtReciveMoney.Value = (ReceiveMoney ?? 0).ToString("0.00");
                this.txtReciveMoney.Attributes.Add("max", (ReceiveMoney ?? 0).ToString("0.00"));
            }
@@ -92,10 +93,11 @@
            {
                this.spanAllMoney.InnerHtml = "¥" + (AllMoney ?? 0).ToString("0.00");
                this.spanReceiveMoney.InnerHtml = "¥" + ReceiveMoney.Value.ToString("0.00");
                this.hidReceiveMoney.Value = (ReceiveMoney ?? 0).ToString("0.0000");
                this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 单";
                this.txtReciveMoney.Enabled = false;
                this.txtReciveMoney.Text = (ReceiveMoney ?? 0).ToString("0.00");
                this.txtReciveMoney.Attributes["readonly"] = "readonly";
                this.txtReciveMoney.Value = (ReceiveMoney ?? 0).ToString("0.00");
                this.txtReciveMoney.Attributes.Add("max", (ReceiveMoney ?? 0).ToString("0.00"));
            }
        }
@@ -106,7 +108,26 @@
            try
            {
                string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
                var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
                decimal molingmoneyvalue = 0;
                if (molingmoney.HasValue && molingmoney.Value > 0)
                {
                    molingmoneyvalue = molingmoney.Value;
                }
                var remoney = this.txtReciveMoney.Value.ToDecimal2();
                var hidremoney = this.hidReceiveMoney.Value.ToDecimal2();
                if (molingmoney.HasValue && molingmoney.Value > 0)
                {
                    if ((remoney + molingmoney.Value) != hidremoney )
                    {
                        JavaScript.MessageBox("操作金额加抹零金额必须等于剩余应付金额!", this);
                        return;
                    }
                }
                foreach (var item in Keys)
                {
                    if (!string.IsNullOrEmpty(item))
@@ -121,11 +142,15 @@
                }
                int? SubjectId = this.selSubject.Value.ToInt32();
                decimal? money = ReceiveMoney;
                if (Request["amount"].ToString2() == "one")
                {
                    money = this.txtReciveMoney.Text.ToDecimal2();
                    money = this.txtReciveMoney.Value.ToDecimal2();
                }
                if (molingmoney.HasValue && molingmoney.Value > 0)
                {
                    money = money - molingmoney.Value;
                }
                int? AccountIdOut = Request["selAccountNameOut"].ToInt32();
@@ -153,13 +178,14 @@
                            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 (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;
@@ -171,9 +197,52 @@
                                m_OA_FirmAccountRecordOut.RecordTypeId = 2;//支出
                                if (Request["amount"].ToString2() == "one")
                                {
                                    m_OA_Procurement.ReceiveMoney += money;
                                    m_OA_FirmAccountRecordOut.Money = money;
                                }
                                else
                                {
                                    m_OA_FirmAccountRecordOut.Money = (m_OA_Procurement.AllMoney - m_OA_Procurement.ReceiveMoney);
                                    m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney;
                                    if (molingmoneyvalue > 0)
                                    {
                                        if (m_OA_Procurement.AllMoney.Value >= molingmoneyvalue)
                                        {
                                            m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney.Value - molingmoneyvalue;
                                            m_OA_FirmAccountRecordOut.Money = m_OA_Procurement.AllMoney.Value - molingmoneyvalue;
                                            molingmoneyvalue = 0;
                                        }
                                        else
                                        {
                                            m_OA_Procurement.ReceiveMoney = 0;
                                            m_OA_FirmAccountRecordOut.Money = 0;
                                            molingmoneyvalue = molingmoneyvalue - m_OA_Procurement.AllMoney.Value;
                                        }
                                    }
                                }
                                if (Request["amount"].ToString2() == "one")
                                {
                                    if (molingmoney.HasValue && molingmoney.Value > 0)
                                    {
                                            m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "结账状态");
                                    }
                                    else
                                    {
                                        if (m_OA_Procurement.ReceiveMoney == m_OA_Procurement.AllMoney)
                                            m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "结账状态");
                                    }
                                }
                                else
                                {
                                    m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "结账状态");
                                }
                                m_OA_FirmAccountRecordOut.SubjectId = m_OA_SubjectSet.Keyid;
                                m_OA_FirmAccountRecordOut.OperationalMatters = "采购付款";
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.financial {
    public partial class PurchasePayEdit {
namespace CY.WebForm.Pages.financial
{
    public partial class PurchasePayEdit
    {
        /// <summary>
        /// Head1 控件。
        /// </summary>
@@ -20,7 +22,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
@@ -29,7 +31,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -38,7 +40,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// spanCountRe 控件。
        /// </summary>
@@ -47,7 +49,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCountRe;
        /// <summary>
        /// spanAllMoney 控件。
        /// </summary>
@@ -56,7 +58,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
        /// <summary>
        /// spanReceiveMoney 控件。
        /// </summary>
@@ -65,7 +67,16 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
        /// <summary>
        /// hidReceiveMoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReceiveMoney;
        /// <summary>
        /// selAcoountTypeOut 控件。
        /// </summary>
@@ -74,7 +85,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountTypeOut;
        /// <summary>
        /// selAccountNameOut 控件。
        /// </summary>
@@ -83,7 +94,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountNameOut;
        /// <summary>
        /// selSubject 控件。
        /// </summary>
@@ -92,7 +103,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
        /// <summary>
        /// txtReciveMoney 控件。
        /// </summary>
@@ -100,8 +111,17 @@
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtReciveMoney;
        /// <summary>
        /// txtMolingMoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtMolingMoney;
        /// <summary>
        /// btn_Submit 控件。
        /// </summary>
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -139,7 +139,7 @@
            }
            if (molingmoney.HasValue)
            if (molingmoney.HasValue && molingmoney.Value > 0)
            {
                if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                {
@@ -171,7 +171,7 @@
                        fukuanshenqing.FukuanStatus = 2;
                    }
                    if (molingmoney.HasValue)
                    if (molingmoney.HasValue && molingmoney.Value > 0)
                    {
                        if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                        {