username@email.com
2025-09-12 72b668c965a3f5308d1a388296eb4c3f8fb7be72
批量入库,操作成功关闭窗口 完成

刷新主页面 完成

以入库的打勾 完成

没入库的变空 完成

库存管理 查询 上机使用这个选项删除 完成

采购管理里也这么显示 供应商模糊查询 金额合计 完成

请示 显示内容和金额,批复也是 完成

ALTER TABLE [dbo].[OA_Fukuanshenqing] ADD [Molingmoney] [money] NULL;
GO

采购付款 申请的时候抹零 完成

外协付款也要改完成
20个文件已修改
280 ■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
@@ -62,6 +62,8 @@
        public decimal? Fukuanmoney { get; set; }
        public decimal? Molingmoney { get; set; }
        public decimal? Yishoumoney { get; set; }
@@ -287,7 +289,11 @@
                this.DindanId = isChange ? MyConvert.ConvertToString(value) : DindanId;
                theValue = this.DindanId;
            }
            else if ("Molingmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
            {
                this.Molingmoney = isChange ? MyConvert.ConvertToDecimal(value) : Molingmoney;
                theValue = this.Molingmoney;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
@@ -132,13 +132,14 @@
                                    new SqlParameter("@Creater",trueModel.Creater),
                                      new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
                                         new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),
                                          new SqlParameter("@Molingmoney",trueModel.Molingmoney.HasValue?trueModel.Molingmoney.Value:0),
            };
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName )";
            string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName,Molingmoney)"
                                             + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName,@Molingmoney )";
            int id = 0;
            try
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -31,12 +31,56 @@
            });
        }
        //为Select新增过滤功能
        function SelectAddSearch() {
            $("select[SelInputHtml='True']").each(function (i, v) {
                $(this).unbind("blur");
                var old = $(this).html();
                var oldObject = $(this).clone();
                var sign = "selectS" + i;
                $(v).attr("sign", sign);
                var inputClass = "input_" + sign;
                var html = "<span style='margin-left:10px'>过滤:</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";//<span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">新增供应商</span>
                $(v).after(html);
                $("." + inputClass).blur(function () {
                    var nowval = $(this).val().trim();
                    var output = "";
                    if (nowval == "" || nowval == null) {
                        output = old;
                    } else {
                        output += "<option value=''>请选择</option>";
                        var valueArr = new Array();
                        oldObject.find("option").each(function (ii, vv) {
                            var value = $.trim($(vv).attr("value"));
                            var text = $.trim($(vv).text());
                            if (text.indexOf(nowval) >= 0)
                                valueArr.push(value + "|||" + text);
                        });
                        for (var ss in valueArr) {
                            var s = valueArr[ss];
                            if (s.split("|||").length == 2) {
                                var value1 = s.split("|||")[0];
                                var text1 = s.split("|||")[1];
                                output += "<option value='" + value1 + "'>" + text1 + "</option>";
                            }
                        }
                    }
                    $(v).html(output);
                });
            });
        }
        
        $(function () {
            $(".UnRecive").each(function (ii, vv) {
                $(vv).remove();
            });
            SelectAddSearch();
        });
@@ -250,7 +294,7 @@
                        外协厂商:
                    </td>
                    <td>
                        <select id='selOutFirm' runat="server" keepdefaultstyle="true">
                        <select id='selOutFirm' runat="server" keepdefaultstyle="true" selinputhtml="True"   class="w122px" >
                        </select>
                    </td>
                    <td class="ali03">
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx
@@ -29,6 +29,10 @@
                    <td class="ali03">金额:</td>
                    <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额"   readonly="readonly"  /></td>
                </tr>
                <tr>
                    <td class="ali03">抹零金额:</td>
                    <td> <input id='txtmolingmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额"    /></td>
                </tr>
                 <tr>
                    <td class="ali03">户名:</td>
                    <td> <input id='txtHuming' runat="server" maxlength='50' placeholder="请输入户名"  style="width:200px;" /></td>
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -207,8 +207,12 @@
                        oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
                        oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
                        oA_Fukuanshenqing.ApprovalStatus = 0;
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
                        oA_Fukuanshenqing.Molingmoney = this.txtmolingmoney.Value.ToDecimal2();
                        if (!oA_Fukuanshenqing.Molingmoney.HasValue)
                        {
                            oA_Fukuanshenqing.Molingmoney = 0;
                        }
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2() - oA_Fukuanshenqing.Molingmoney;
                        oA_Fukuanshenqing.Bank = this.txtBank.Value;
                        oA_Fukuanshenqing.Huming = this.txtHuming.Value;
                        oA_Fukuanshenqing.AccountID = this.txtAccountID.Value;
@@ -273,9 +277,10 @@
                            m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                            m_OA_WorkPlan.PlanComplany = id.ToString();
                            m_OA_WorkPlan.PlanContent = orderNoStr + " 采购付款申请。订单金额:"+ this.ordernjine.InnerText + ", 收款单位:"+ _SupplierName + ", 户名:" + oA_Fukuanshenqing.Huming;
                            m_OA_WorkPlan.PlanContent = orderNoStr + " 采购付款申请。订单金额:"+ this.ordernjine.InnerText + ",抹零金额:" + this.txtmolingmoney.Value + ", 收款单位:" + _SupplierName + ", 户名:" + oA_Fukuanshenqing.Huming;
                            m_OA_WorkPlan.PlanDataType = 16;
                            m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
                            m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
                            m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
                            m_OA_WorkPlan.PlanRunTime = DateTime.Now;
                            m_OA_WorkPlan.PlanTitle = this.txtPlanTitle.Value.Trim(); 
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.designer.cs
@@ -60,6 +60,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtZengjianmoney;
        /// <summary>
        /// txtmolingmoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtmolingmoney;
        /// <summary>
        /// txtHuming 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -22,6 +22,10 @@
                    <td class="ali03">金额:</td>
                    <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额"   readonly="readonly"  /></td>
                </tr>
                <tr>
                    <td class="ali03">抹零金额:</td>
                    <td> <input id='txtmolingmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额"    /></td>
                </tr>
                 <tr>
                    <td class="ali03">户名:</td>
                    <td> <input id='txtHuming' runat="server" maxlength='50' placeholder="请输入户名"  style="width:200px;" /></td>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -199,8 +199,13 @@
                        oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
                        oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
                        oA_Fukuanshenqing.ApprovalStatus = 0;
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
                        oA_Fukuanshenqing.Molingmoney = this.txtmolingmoney.Value.ToDecimal2();
                        if (!oA_Fukuanshenqing.Molingmoney.HasValue)
                        {
                            oA_Fukuanshenqing.Molingmoney = 0;
                        }
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2()- oA_Fukuanshenqing.Molingmoney;
                        oA_Fukuanshenqing.Bank = this.txtBank.Value;
                        oA_Fukuanshenqing.Huming = this.txtHuming.Value;
                        oA_Fukuanshenqing.AccountID = this.txtAccountID.Value;
@@ -265,9 +270,10 @@
                            m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                            m_OA_WorkPlan.PlanComplany = id.ToString();
                            m_OA_WorkPlan.PlanContent = orderNoStr + ",订单金额:" + this.ordernjine.InnerText + ", 收款单位:"+ _SupplierName + "。" ;
                            m_OA_WorkPlan.PlanContent = orderNoStr + ",订单金额:" + this.ordernjine.InnerText + ",抹零金额:" + this.txtmolingmoney.Value + ", 收款单位:" + _SupplierName + "。" ;
                            m_OA_WorkPlan.PlanDataType = 14;
                            m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
                            m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
                            m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
                            m_OA_WorkPlan.PlanRunTime = DateTime.Now;
                            m_OA_WorkPlan.PlanTitle =  "订单金额:" + this.ordernjine.InnerText + ", 收款单位:" + _SupplierName + "。"; 
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -51,6 +51,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtZengjianmoney;
        /// <summary>
        /// txtmolingmoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtmolingmoney;
        /// <summary>
        /// txtHuming 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
@@ -151,7 +151,7 @@
                    抹零金额:
                </td>
                <td>
                    <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" onchange="molinya();" />(元)
                    <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0"   readonly="readonly" />(元)
                </td>
            </tr>
        <tr>
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
@@ -98,10 +98,15 @@
                this.spanReceiveMoney.InnerHtml = "¥" + ReceiveMoney.Value.ToString("0.00");
                this.hidReceiveMoney.Value =  ReceiveMoney.Value.ToString();
                this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 单";
                this.txtMolingMoney.Value = fukuanshenqing.Molingmoney.HasValue ? fukuanshenqing.Molingmoney.Value.ToString("0.00") : "0";
                this.txtReciveMoney.Value = (ReceiveMoney ?? 0).ToString("0.00");
                this.txtReciveMoney.Attributes.Add("max", (ReceiveMoney ?? 0).ToString("0.00"));
                if (fukuanshenqing.Molingmoney.HasValue)
                {
                    this.txtReciveMoney.Value = (ReceiveMoney.Value - fukuanshenqing.Molingmoney.Value).ToString("0.00");
                }
            }
               
@@ -152,11 +157,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 +170,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(',');
                        var ssss = false;
@@ -186,14 +191,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;
                                    }
@@ -314,7 +321,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);
                                            }
                                        }
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
@@ -101,7 +101,7 @@
                    抹零金额:
                </td>
                <td>
                    <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" onchange="molinya();" />(元)
                    <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0"  readonly="readonly" />(元)
                </td>
            </tr>
        <tr>
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");
                }
            }
           
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs
@@ -57,7 +57,7 @@
            var  name   = dwWarehouse.SelectedItem.Text;
            if (bll_OA_OutOfStorageBLL.InsertModelList(Keys, dwWarehouse.SelectedValue.ToInt32(), name))
            {
                JavaScript.MessageBox("操作成功", this, "Refreshss();top.Dialog.close();");
                JavaScript.MessageBox("操作成功", this, "top.document.getElementById('_DialogFrame_0').contentWindow.ReWindowSelf();top.frmright.ReLoad();top.Dialog.close();");
            }
           
        }
CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.cs
@@ -49,7 +49,7 @@
        protected void InitialData()
        {
            //仓库
            this.selWarehouseId.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
            this.selWarehouseId.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId).Where(x => x.WarehouseName != "上机使用");
            this.selWarehouseId.DataTextField = "WarehouseName";
            this.selWarehouseId.DataValueField = "Keyid";
            this.selWarehouseId.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageList.aspx.cs
@@ -63,7 +63,7 @@
        protected void InitialData()
        {
            //仓库
            this.selWarehouseId.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
            this.selWarehouseId.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId).Where(x => x.WarehouseName != "上机使用");
            this.selWarehouseId.DataTextField = "WarehouseName";
            this.selWarehouseId.DataValueField = "Keyid";
            this.selWarehouseId.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -375,6 +375,22 @@
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                    <tr class="StatisticsMoney">
                    <td colspan="10" class="ali03">
                        合计:
                    </td>
                    <td   class="ali01">
                        <%=shuliangya %>
                    </td>
                     <td   class="ali01">
                        <%=jineya %>
                    </td>
                          <td   class="ali01" colspan="7">
                    </td>
                </tr>
                    </table>
                </FooterTemplate>
            </asp:Repeater>
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
@@ -23,6 +23,8 @@
        OA_ProcurementBLL _OA_ProcurementBLL = null;
        OA_Procurement Procuremet = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        public string shuliangya = "";
        public string jineya = "";
        public ProcurementList()
        {
@@ -78,7 +80,33 @@
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            pa.PageSize = this.ddlPageSize.Value.ToInt32().Value;// UCPager1.AspNetPager.PageSize;
            UCPager1.AspNetPager.PageSize = this.ddlPageSize.Value.ToInt32().Value;
            ReProcurentList.DataSource = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId, this.selOpretor.Value, this.selPurchaseStatus.Value, this.selClearingStatus.Value, this.selSuppliers.Value, this.selGoodsName.Value, this.dwCommity.SelectedValue, this.txtRegTimeStart.Value.ToDateTime2(), this.txtRegTimeEnd.Value.ToDateTime2(), this.txtBrandName.Value, this.txtPaperWeight.Value);
            var oA_Procurements = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId, this.selOpretor.Value, this.selPurchaseStatus.Value, this.selClearingStatus.Value, this.selSuppliers.Value, this.selGoodsName.Value, this.dwCommity.SelectedValue, this.txtRegTimeStart.Value.ToDateTime2(), this.txtRegTimeEnd.Value.ToDateTime2(), this.txtBrandName.Value, this.txtPaperWeight.Value);
            foreach(var oA_Procurement  in oA_Procurements)
            {
                if(oA_Procurement.PurchaseStatus == "已入库")
                {
                    oA_Procurement.PurchaseStatus = "✓";
                }
                else if (oA_Procurement.PurchaseStatus == "待入库")
                {
                    oA_Procurement.PurchaseStatus = "";
                }
            }
            shuliangya = oA_Procurements.Sum(x => x.Quantity).ToString();
            var AllMoney = oA_Procurements.Sum(x => x.AllMoney);
            if (AllMoney.HasValue)
            {
                jineya = AllMoney.Value.ToString("F2");
            }
            else
            {
                jineya = "0";
            }
            ReProcurentList.DataSource = oA_Procurements;
            ReProcurentList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -150,16 +150,19 @@
                            <th width="70" style="text-align: center">
                                请示类别
                            </th>
                            <th style="text-align: center">
                                请示主题
                            <th  width="300"  style="text-align: center">
                                请示内容
                            </th>
                            <th style="text-align: center">
                             <th width="70" style="text-align: center">
                                申请费用(元)
                            </th>
                            <th width="70" style="text-align: center">
                                是否批复
                            </th>
                            <th style="text-align: center">
                            <th width="70" style="text-align: center">
                                批复结果
                            </th>
                            <th style="text-align: center">
                            <th width="70" style="text-align: center">
                                操作
                            </th>
                        </tr>
@@ -179,7 +182,10 @@
                            <%#Eval("PlanDataTypeName")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanTitle")%>
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanMoney", "{0:F2}")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanStatus").ToString()=="1"?"未批复":"已批复"%>
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -116,16 +116,19 @@
                            <th width="70" style="text-align: center">
                                请示类别
                            </th>
                            <th style="text-align: center">
                                请示主题
                             <th  width="300"  style="text-align: center">
                                请示内容
                            </th>
                            <th style="text-align: center">
                             <th width="70" style="text-align: center">
                                申请费用(元)
                            </th>
                            <th width="70" style="text-align: center">
                                是否批复
                            </th>
                            <th style="text-align: center">
                            <th width="70" style="text-align: center">
                                批复结果
                            </th>
                            <th style="text-align: center">
                            <th  width="70" style="text-align: center">
                                操作
                            </th>
                        </tr>
@@ -145,7 +148,11 @@
                            <%#Eval("PlanDataTypeName")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanTitle")%>
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanMoney", "{0:F2}")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanStatus").ToString()=="1"?"未批复":"已批复"%>