username@email.com
2024-12-24 a0d38325a97957b37dd755bf732b63f6f7e2a5ff
修改外协付款
28个文件已修改
6个文件已添加
1695 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx 172 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs 348 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
@@ -140,7 +140,7 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<OA_Fukuanshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
   string Creater, string SupplierName,string shifoufukuan)
   string Creater, string SupplierName,string shifoufukuan,string selFukuanyongtu)
        {
            string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
@@ -157,6 +157,8 @@
                Condition += " and  ok.SupplierName like '%" + SupplierName + "%'    ";
            if (!string.IsNullOrEmpty(shifoufukuan))
                Condition += " and  ok.FukuanStatus = '" + shifoufukuan + "'";
            if (!string.IsNullOrEmpty(selFukuanyongtu))
                Condition += " and  ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
            Query query = new Query();
            IList<Criterion> criterias = new List<Criterion>()
@@ -176,7 +178,7 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<OA_Fukuanshenqing> SelectModelPageweikaipiao(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
   string Creater, string SupplierName, string shifoufukuan)
   string Creater, string SupplierName, string shifoufukuan, string selFukuanyongtu)
        {
            string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 and ok.Youwufapiao !=2 and ok.FukuanStatus = 2 ";
@@ -193,6 +195,8 @@
                Condition += " and  ok.SupplierName like '%" + SupplierName + "%'    ";
            if (!string.IsNullOrEmpty(shifoufukuan))
                Condition += " and  ok.FukuanStatus = '" + shifoufukuan + "'";
            if (!string.IsNullOrEmpty(selFukuanyongtu))
                Condition += " and  ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
            Query query = new Query();
            IList<Criterion> criterias = new List<Criterion>()
CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
@@ -93,7 +93,7 @@
            return outOfStorageDAL.getModelList(pa, FirmId, Operator, InfoType, SuppliersId, GoodsNameId, WarehouseId, beginTime, endTime, BrandName, SpeceicationName, PaperWeightName, GoodsTypeId);
        }
        public bool InsertModelList(string[] Keys, int? WarehouseId)
        public bool InsertModelList(string[] Keys, int? WarehouseId, string WarehouseName )
        {
            try
            {
@@ -102,6 +102,7 @@
                {
                    foreach (var Keyid in Keys)
                    {
                        OA_Procurement m_OA_Procurement = new OA_Procurement();
                        OA_Inventory m_OA_Inventory = new OA_Inventory();
                        OA_OutOfStorage m_OA_OutOfStorage = new OA_OutOfStorage();
@@ -113,40 +114,43 @@
                        m_OA_Procurement = _OA_ProcurementBLL.SelectSingleModel(Keyid);
                        m_OA_Procurement.PurchaseStatusId = 201;
                        m_OA_Procurement.Remark = m_OA_WarehouseInfo.WarehouseName;
                        if (!WarehouseName.Equals("上机使用"))
                        {
                            //库存表对象
                            m_OA_Inventory.CargoSpaceId = 0;
                            m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
                            m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
                            m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
                            m_OA_Inventory.LastUpdateTime = DateTime.Now;
                            m_OA_Inventory.Operator = m_OA_Procurement.Operator;
                            m_OA_Inventory.Remark = "";
                            m_OA_Inventory.WarehouseId = WarehouseId;
                            m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
                            m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
                            m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
                            m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
                            m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
                        //库存表对象
                        m_OA_Inventory.CargoSpaceId = 0;
                        m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
                        m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
                        m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
                        m_OA_Inventory.LastUpdateTime = DateTime.Now;
                        m_OA_Inventory.Operator = m_OA_Procurement.Operator;
                        m_OA_Inventory.Remark = "";
                        m_OA_Inventory.WarehouseId = WarehouseId;
                        m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
                        m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
                        m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
                        m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
                        m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
                        //出入库信息表对象
                        m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
                        m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
                        m_OA_OutOfStorage.CargoSpaceId = 0;
                        m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
                        m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
                        m_OA_OutOfStorage.Remark = "";
                        m_OA_OutOfStorage.WarehouseId = WarehouseId;
                        m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
                        m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
                        m_OA_OutOfStorage.InfoType = "入库";
                        m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
                        m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
                        m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
                        m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
                        m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
                        m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
                        isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
                            //出入库信息表对象
                            m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
                            m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
                            m_OA_OutOfStorage.CargoSpaceId = 0;
                            m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
                            m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
                            m_OA_OutOfStorage.Remark = "";
                            m_OA_OutOfStorage.WarehouseId = WarehouseId;
                            m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
                            m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
                            m_OA_OutOfStorage.InfoType = "入库";
                            m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
                            m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
                            m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
                            m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
                            m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
                            m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
                            isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
                        }
                        if (isSuccess)
                        {
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1028,7 +1028,9 @@
                new SqlParameter("@businessManager",DBNull.Value){SqlDbType=SqlDbType.Int},
                new SqlParameter("@payType",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                new SqlParameter("@returnvisit",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20}
                 new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                  new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500}
            };
            /*
@@ -1095,9 +1097,9 @@
                }
            }
            /*获取页数与返回数据条数*/
            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[19].Value);
            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
            pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[21].Value);
            pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
            return result;
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1883,6 +1883,7 @@
    <Content Include="Pages\business\BackVisitNoteEdit.aspx" />
    <Content Include="Pages\business\BargainPrice.aspx" />
    <Content Include="Pages\business\BargainPriceByFirm.aspx" />
    <Content Include="Pages\business\WaixieOrderPrint.aspx" />
    <Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
    <Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
    <Content Include="Pages\business\InvoicingWeiquerenshouru.aspx" />
@@ -2042,6 +2043,7 @@
    <Content Include="Pages\common\U_Login.ascx" />
    <Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" />
    <Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
    <Content Include="Pages\financial\NewWaixieExpenses.aspx" />
    <Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" />
    <Content Include="Pages\financial\WaixieExpenses.aspx" />
    <Content Include="Pages\financial\FirmAccountPrint.aspx" />
@@ -3302,6 +3304,13 @@
    <Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs">
      <DependentUpon>BargainPriceByFirm.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
      <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\business\WaixieOrderPrint.aspx.designer.cs">
      <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\Waixiefukuanweikaipiao.aspx.cs">
      <DependentUpon>Waixiefukuanweikaipiao.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -4415,6 +4424,13 @@
    <Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.designer.cs">
      <DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\financial\NewWaixieExpenses.aspx.cs">
      <DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\financial\NewWaixieExpenses.aspx.designer.cs">
      <DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\financial\OutsourcePiliangPayMoney.aspx.cs">
      <DependentUpon>OutsourcePiliangPayMoney.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -29,6 +29,69 @@
                $(vv).remove();
            });
        });
        /*
确认批量开票申请
*/
        function ToWaixieFukuan() {
            var ids = '';
            var ordernos = '';
            var cks = $("input[name='ckId']:checked");
            if (cks.length == 0) {
                alertMsg('没有选中任何项!');
                return;
            }
            else {
            }
            var SellerId = '';
            var i = 0;
            cks.each(
                function () {
                    var ckVal = $(this).val();
                    var ckValJson = eval('(' + ckVal + ')');
                    if (i == 0) {
                        SellerId = ckValJson.SellerId;
                        i += 1;
                    } else {
                        if (SellerId != ckValJson.SellerId) {
                            SellerId = ''
                        }
                    }
                    ids = ids + ',' + ckValJson.id;
                    ordernos = ordernos + ',' + ckValJson.orderId;
                }
            );
            if (SellerId == '') {
                alertMsg('必须选择同一个外协厂商!');
                return;
            }
            kaipiaoConfirm(ids, ordernos);
            //var msg = ('确认开票申请吗?');
            //top.Dialog.confirm(msg, function () {
            //    DoAcceptAll3(ids);
            //});
        }
        function kaipiaoConfirm(orderId, orderno) {
            var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
            top.Dialog.open({ URL: url, Title: "外协付款申请", Height: 600, Width: 580 });
        }
    </script>
</head>
<body>
@@ -94,6 +157,10 @@
                <div class="left">
                    <div class="right">
                        <div class="padding_top5 padding_left10">
                            <a href="javascript:;"   onclick="ToWaixieFukuan()"><span class="icon_edit">外协付款申请</span></a>
                              <div class="box_tool_line">
                            </div>
                            <a style="color: #666; cursor: inherit;">(如果外协给线上厂商的订单被受理,那么此外协订单不可再修改,也不可删除。)</a>
                        </div>
                    </div>
@@ -154,7 +221,12 @@
                        <ItemTemplate>
                            <tr>
                                <td>
                                    <input type="checkbox" name='ckId' value='<%#Eval("Keyid")%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
                                    <input type="checkbox"  name='ckId' value_keyid="<%#Eval("Keyid")%>"   value="{
                                    id:<%#Eval("Keyid")%>,
                                    buyerId:'<%#Eval("BuyerId")%>',
                                    SellerId:'<%#Eval("SellerId")%>',
                                         orderId:'<%#Eval("SellerOrderId")%>'
                                    }" id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
                                </td>
                                <td>
                                    <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.business {
    public partial class AgOutsourcSingleAllList {
namespace CY.WebForm.Pages.business
{
    public partial class AgOutsourcSingleAllList
    {
        /// <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>
        /// txtStartCreatTime 控件。
        /// </summary>
@@ -47,7 +49,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartCreatTime;
        /// <summary>
        /// txtEndCreatTime 控件。
        /// </summary>
@@ -56,7 +58,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndCreatTime;
        /// <summary>
        /// txtCreater 控件。
        /// </summary>
@@ -65,7 +67,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreater;
        /// <summary>
        /// selOutFirm 控件。
        /// </summary>
@@ -74,7 +76,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selOutFirm;
        /// <summary>
        /// selWorkStates 控件。
        /// </summary>
@@ -83,7 +85,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
        /// <summary>
        /// txtStartReturnTime 控件。
        /// </summary>
@@ -92,7 +94,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartReturnTime;
        /// <summary>
        /// txtEndReturnTime 控件。
        /// </summary>
@@ -101,7 +103,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndReturnTime;
        /// <summary>
        /// txtOutOrderId 控件。
        /// </summary>
@@ -110,7 +112,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOutOrderId;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
@@ -119,7 +121,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_Search;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
@@ -128,7 +130,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// UCPager1 控件。
        /// </summary>
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
@@ -56,7 +56,7 @@
        </td>
    </tr>
            <tr >
                    <td  class="contentLeft" colspan='2' >发票号码:<input id='txtFapiaohao' runat="server" maxlength='50'   /></td>
                    <td  class="contentLeft" colspan='2' >发票号码:<input id='txtFapiaohao' runat="server" maxlength='50' style="width:80%;"   /></td>
                    
                </tr>
     <tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
@@ -285,9 +285,9 @@
                                 
                               
                               
                                 <td>
                                 <td >
                                      
                                         <a href='javascript:void(0)' title='付款登记' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 删除    </a>
                                         <a href='javascript:void(0)' menu_member_case_id="case_delete" menu_member_case_name="删除" title='删除' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 删除    </a>
                                     
                                </td>
                                
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -347,9 +347,9 @@
                            <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" menu_member_case_id="case_ToPrintAwbOrder" menu_member_case_name="打印送货单" onclick="ToPrintAwbOrder()"><span class="icon_edit">打印送货单</span></a>
                             <div class="box_tool_line">
                            <%-- <div class="box_tool_line">
                            </div>
                            <a href="javascript:;"   onclick="ToWaixieFukuan()"><span class="icon_edit">外协付款申请</span></a>
                            <a href="javascript:;"   onclick="ToWaixieFukuan()"><span class="icon_edit">外协付款申请</span></a>--%>
                            <div class="clear">
                            </div>
                        </div>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -195,6 +195,12 @@
                    <td style="width: 215px">
                        <input id="txtBeginData" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
                    </td>
                     <td class="ali03">
                        客户名称:
                    </td>
                    <td>
                        <input id='txtCustormerName' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        订单编号:
                    </td>
@@ -221,12 +227,7 @@
                    <td>
                        <input id='txtCreaterName' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        客户名称:
                    </td>
                    <td>
                        <input id='txtCustormerName' runat="server" maxlength='50' />
                    </td>
                </tr>
                <tr style="padding-left: 50px">
                    <%--<td class="ali03">
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
@@ -60,6 +60,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
        /// <summary>
        /// txtCustormerName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
        /// <summary>
        /// txtOrderId 控件。
        /// </summary>
        /// <remarks>
@@ -76,15 +85,6 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
        /// <summary>
        /// txtCustormerName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
        /// <summary>
        /// selCustormerManager 控件。
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
New file
@@ -0,0 +1,172 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WaixieOrderPrint.aspx.cs" Inherits="CY.WebForm.Pages.business.WaixieOrderPrint" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>开票订单打印</title>
    <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
    <script src="../../js/common/util.js" type="text/javascript"></script>
    <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
    <script src="../../js/common/Printter.js?v=14" type="text/javascript"></script>
    <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <!--前台页面start-->
    <style type="text/css">
        .dbody { margin: 0; margin-left: auto; margin-right: auto; }
        .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
        .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid;}
        .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
        .dbody table th { background-color: #E0EDF6; font-weight: bold; }
        .dbody table td { border-left: 0; padding-left:2px; }
        .left {text-align: right; }
        #div_tool { text-align: center; }
    </style>
    <script type="text/javascript">
        window.printBeginCallBack = function () {
            document.getElementById('fram_operate').style.display = 'none';
        };
        window.printOverCallBack = function () {
            document.getElementById('fram_operate').style.display = '';
        };
    </script>
</head>
<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
    <form id="form1" runat="server">
    <input type="hidden" runat="server" id="hideOrderId" />
    <div class='dbody'>
        <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
            <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
        </object>
        <div id='div_tool' >
        </div>
                     <table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
                     <thead>
                    <tr>
                        <th width='25px'>
                            编号
                        </th>
                        <th class='w80px'>
                            外协时间
                        </th>
                        <th class='w80px'>
                            外协订单号
                        </th>
                        <th>
                            原订单号
                        </th>
                        <th>
                            外协厂商
                        </th>
                         <th class='w50px'>
                            印刷类别
                        </th>
                        <th class='w50px'>
                            订单状态
                        </th>
                        <th class='w50px'>
                            支付状态
                        </th>
                        <th class='w50px'>
                            订单类型
                        </th>
                        <th class='w80px'>
                            印刷数量
                        </th>
                        <th class='w80px'>
                            金额
                        </th>
                        <th class='w80px'>
                            已付款
                        </th>
                        <th class='w80px'>
                            未付款
                        </th>
                    </tr>
                </thead>
                <tbody>
                  <asp:Repeater runat="server" ID='rptOrder'>
                <ItemTemplate>
                            <tr>
                           <td>
                                    <%#Container.ItemIndex +1%>
                                </td>
                                <td>
                                    <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
                                </td>
                                <td>
                                   <%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("Keyid") %>)'></a>--%>
                                        <%#Eval("SellerOrderId")%>
                                </td>
                                <td>
                                   <%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("OldOrderId") %>)'></a>--%>
                                        <%#Eval("OldOrderSellerId")%>
                                </td>
                                <td>
                                    <%#Eval("SellerName")%>
                                </td>
                                <td>
                                    <%#Eval("PrintType.PrintName")%>
                                </td>
                                <td>
                                    <%#Eval("OrderStateObj.Name")%>
                                </td>
                                <td>
                                    <%#Eval("PayStateObj.Name")%>
                                </td>
                                <td>
                                    <%#Eval("OrderType.Name")%>
                                </td>
                                <td>
                                    <%#Eval("OrderExtend.PrintNum")%>
                                </td>
                                <td class="OrderAllMoney">
                                    <%#Eval("SumPrice", "{0:F}")%>
                                </td>
                                <td class="OrderAlreadyMoney">
                                    <%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
                                </td>
                                <td class='OrderNoMoney <%#Eval("UnPayedMoney","{0:F}")=="0.00"?"":"red"%>'>
                                    <%#Eval("UnPayedMoney","{0:F}")%>
                                </td>
                            </tr>
                        </itemtemplate>
                    </asp:repeater>
                    <tr>
                         <td colspan="10">
                             合计
</td>
                         <td  >
                            <span id="Spanjineheji"  runat="server" ></span>
</td>
                         <td  >
                            <span id="Spanyishou"  runat="server" ></span>
</td>
                         <td  >
                            <span id="Spanweishou"  runat="server" ></span>
</td>
                    </tr>
                </tbody>
                          </table>
    </div>
    </form>
</body>
</html>
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs
New file
@@ -0,0 +1,176 @@
/**
* OrderDeatil.aspx.cs
*
* 功 能: 订单详情
* 类 名: OrderDeatil
*
* Ver    变更日期             负责人  变更内容
* ───────────────────────────────────
* V0.01  2013-4-24 13:25      吴崎均    初版
* V0.02  2013-5-15 18:23      吴崎均    编辑界面样式
* V0.03  2013-5-15 15:58      吴崎均    完成数据获取
* V0.04  2013-5-21 14:38      吴崎均    增加订单进度
* V0.05  2013-5-23 9:33       吴崎均    修改继承类为默认类Page使显示信息不受登录控制
*
*
*
*
*
*
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL.EC;
using CY.Infrastructure.Common;
using CY.Model;
using CY.BLL;
using CY.Model.Inquiry;
using CY.BLL.Sys;
using CY.Infrastructure.Query;
namespace CY.WebForm.Pages.business
{
    public partial class WaixieOrderPrint : BasePage
    {
        EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
        OA_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
        public static string SellerOrderId = "";
        public static string PrintType = "";
        /// <summary>
        /// 页面加载事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        protected void Page_Load(object sender, EventArgs e)
        {
            try
            {
                switch (Request["Target"])
                {
                    case "GetCommunication":
                        break;
                    case "print":
                        break;
                    default:
                        Page_Load_Default();
                        return;
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                Response.Clear();
                Response.Write("-1");
            }
            Response.End();
        }
        /// <summary>
        /// 默认加载事件方法
        /// </summary>
        private void Page_Load_Default()
        {
            LoadOrderInfo();
        }
        /// <summary>
        /// 加载订单信息
        /// </summary>
        private bool LoadOrderInfo()
        {
            string KaipiaoshenqingId = Request["Keyid"] == null ? "" : Request["Keyid"];
            string orderids = Request["SellerOrderId"] == null ? "" : Request["SellerOrderId"];
            Dictionary<int, object> searchParam = new Dictionary<int, object>();
            SetParamValue(searchParam, 0, CurrentUser.MemberId);
            SetParamValue(searchParam, 17, orderids);
            SearchParam = searchParam;
            Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
            {
                PageSize = 1000,// UCPager1.AspNetPager.PageSize,
                PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
            };
            //this.RepClientList.DataSource =
            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Outsource(pagination, SearchParam);
            rptOrder.DataSource = result;
            rptOrder.DataBind();
            this.Spanjineheji.InnerText = string.Format("{0:F2}", result.Sum(x => x.SumPrice));
            this.Spanyishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.TradingSingle.PayedMoney));
            this.Spanweishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.UnPayedMoney));
            return true;
        }
        /// <summary>
        /// 设置查询参数方法
        /// </summary>
        /// <param name="target">设置目标</param>
        /// <param name="key">键</param>
        /// <param name="value">值</param>
        private static void SetParamValue(Dictionary<int, object> target, int key, object value)
        {
            if (string.IsNullOrEmpty(string.Format("{0}", value)))
                return;
            else
            {
            }
            if (target.ContainsKey(key))
            {
                target[key] = value;
            }
            else
            {
                target.Add(key, value);
            }
        }
        /// <summary>
        /// 查询参数
        /// </summary>
        private Dictionary<int, object> SearchParam
        {
            get
            {
                return ViewState["SearchParam"] as Dictionary<int, object>;
            }
            set
            {
                ViewState["SearchParam"] = value;
            }
        }
        /// <summary>
        /// 是否已经操作
        /// </summary>
        /// <param name="keyid"></param>
        /// <param name="orderState"></param>
        /// <param name="opType"></param>
        /// <returns></returns>
        public bool IsOpearted(object keyidObj, object orderStateObj, object opTypeObj)
        {
            int keyid = (int)keyidObj;
            int orderState = (int)orderStateObj;
            string opType = (string)opTypeObj;
            return _eC_OrderBasicBLL.IsOpearted(keyid, orderState, opType);
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs
New file
@@ -0,0 +1,80 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.business
{
    public partial class WaixieOrderPrint
    {
        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// hideOrderId 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
        /// <summary>
        /// rptOrder 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater rptOrder;
        /// <summary>
        /// Spanjineheji 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanjineheji;
        /// <summary>
        /// Spanyishou 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanyishou;
        /// <summary>
        /// Spanweishou 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanweishou;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -89,9 +89,13 @@
            top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "催款", Width: 600, Height: 800 });
        }
        //外协付款
        function ViewShoukuan(personId) {
            top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "外协付款", Width: 600, Height: 800 });
        function ViewShoukuan(personId, yongtu, supplierId) {
            if (yongtu == "外协加工费" && supplierId.length > 10) {
                top.Dialog.open({ URL: "/Pages/financial/NewWaixieExpenses.aspx?id=" + personId, Title: "外协付款", Width: 600, Height: 800 });
            } else {
                top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "外协付款", Width: 600, Height: 800 });
            }
           
           
        }
@@ -113,13 +117,21 @@
        
        //查看客户资料
        function Viewkaipiao(Keyid, SellerOrderId) {
            //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
            top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
        function Viewkaipiao(Keyid, SellerOrderId, yongtu, supplierId) {
            if (yongtu == "外协加工费") {
                if (supplierId.length > 10) {
                    top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
                } else {
                    top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
                }
            }
        }
        //查看
        function onView(keyid, yongtu) {
            if (yongtu !="其他付款") {
            if (yongtu != "其他付款" && yongtu != "外协加工费") {
                top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
            }
          
@@ -177,6 +189,16 @@
                    </td>
                    <td>
                        <input id='txtCreatorName' runat="server" maxlength='50' />
                    </td>
                      <td class="ali03">
                       付款用途:
                    </td>
                    <td>
                         <select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
                           <option value="">全部</option>
                            <option value="外协加工费">外协加工费</option>
                            <option value="其他付款">其他付款</option>
                        </select>
                    </td>
                    <td class="ali03">
                       是否付款:
@@ -331,7 +353,7 @@
                                
                                <td>
                                    
                                  <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'>  查看订单   </a>" %>     <%--<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'>  查看订单   </a>--%>
                                  <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'>  查看订单   </a>" %>     <%--<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'>  查看订单   </a>--%>
                                    
                                  
                                </td>
@@ -342,7 +364,7 @@
                                 <td>
                                      
                                         
                                     <a href='javascript:void(0)' title='付款' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 付款    </a>
                                     <a href='javascript:void(0)' title='付款' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 付款    </a>
                                     
                                </td>
                                
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -557,7 +557,7 @@
                PageSize = UCPager1.AspNetPager.PageSize,
                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
            };
            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value);
            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
            rptData.DataSource = result;
            rptData.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs
@@ -78,6 +78,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatorName;
        /// <summary>
        /// selFukuanyongtu 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selFukuanyongtu;
        /// <summary>
        /// selPayStates 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -12,12 +12,15 @@
                
                 <tr>
                    <td class="ali03">收款单位:</td>
                    <td> <select keepdefaultstyle='true' id='selSuppliers' runat="server"  datatextfield='Name' datavaluefield='Keyid'  onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True"  style=" width:183px;"  >
                        </select></td>
                    <td> <%--<select keepdefaultstyle='true' id='selSuppliers' runat="server"  datatextfield='Name' datavaluefield='Keyid'  onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True"  style=" width:183px;"  >
                        </select>--%>
                        <input id='txtSupplierName' runat="server" maxlength='50' placeholder="请输入收款单位"  style="width:200px;" readonly="readonly" />
                        <input type="hidden" id='selSuppliersss' runat="server" />
                    </td>
                </tr>
                 <tr>
                    <td class="ali03">金额:</td>
                    <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额" /></td>
                    <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="请输入金额"   readonly="readonly"  /></td>
                </tr>
                 <tr>
                    <td class="ali03">户名:</td>
@@ -35,7 +38,7 @@
                    <td class="ali03">订单:</td>
                    <td> <span id="ordernos" runat="server" ></span></td>
                </tr>
                  <tr>
                  <tr style="display:none;">
                    <td class="ali03">订单金额:</td>
                    <td> <span id="ordernjine" runat="server" ></span></td>
                </tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -78,10 +78,10 @@
            if (!string.IsNullOrEmpty(orderIdStr))
            {
                this.ordernos.InnerText = orderNoStr.Trim(',');
                //供应商
                this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
                this.selSuppliers.DataBind();
                this.selSuppliers.Items.Insert(0, new ListItem("全部", ""));
                ////供应商
                //this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
                //this.selSuppliers.DataBind();
                //this.selSuppliers.Items.Insert(0, new ListItem("全部", ""));
                decimal total = 0;
@@ -89,9 +89,24 @@
                string[] idsArray = orderIdStr.Split(',');
                if (idsArray != null && idsArray.Length > 0)
                {
                    var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
                    if (models.Count > 0)
                    {
                      var  corporateClients = _oA_CorporateClientsBLL.GetModel(models[0].SellerId);
                        this.txtSupplierName.Value = corporateClients.OutVendorName;
                        this.selSuppliersss.Value = corporateClients.Keyid.ToString();
                     var sss =   _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId).Select("Name = '"+ corporateClients.OutVendorName + "'");
                        if (sss.Length > 0)
                        {
                            this.txtHuming.Value = sss[0]["Huming"].ToString();
                            this.txtBank.Value = sss[0]["Bank"].ToString();
                            this.txtAccountID.Value = sss[0]["AccountID"].ToString();
                        }
                    }
                    total = models.Sum(x => x.SumPrice) ?? 0;
@@ -99,6 +114,7 @@
                    ordernjine.InnerText = total.ToString("0.00");
                    this.txtZengjianmoney.Value = total.ToString("0.00");
                    //khname.InnerText = name;
                    //Dingdanshu.InnerText = orderIdStr.Split(',').Length +"个";
                }
@@ -141,11 +157,11 @@
        public void AcceptAll3()
        {
            if (string.IsNullOrEmpty(this.selSuppliers.Value))
            {
                JavaScript.MessageBox("请选择收款单位!", this);
                return;
            }
            //if (string.IsNullOrEmpty(this.selSuppliers.Value))
            //{
            //    JavaScript.MessageBox("请选择收款单位!", this);
            //    return;
            //}
            if (this.txtZengjianmoney.Value.ToDecimal2()<=0)
            {
@@ -178,7 +194,7 @@
                        oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
                        oA_Fukuanshenqing.SupplierId = this.selSuppliers.Value;
                        oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
                        oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
                        oA_Fukuanshenqing.ApprovalStatus = 0;
                        oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
@@ -200,12 +216,14 @@
                        oA_Fukuanshenqing.CreateTime = DateTime.Now;
                        oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
                        oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
                        var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
                        var _SupplierName = "";
                        if (oA_Suppliers != null)
                        {
                            _SupplierName = oA_Suppliers.Name;
                        }
                        //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
                        //var _SupplierName = "";
                        //if (oA_Suppliers != null)
                        //{
                        //    _SupplierName = oA_Suppliers.Name;
                        //}
                        var _SupplierName = this.txtSupplierName.Value;
                        oA_Fukuanshenqing.SupplierName = _SupplierName;
                        var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -24,13 +24,22 @@
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// selSuppliers 控件。
        /// txtSupplierName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSupplierName;
        /// <summary>
        /// selSuppliersss 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden selSuppliersss;
        /// <summary>
        /// txtZengjianmoney 控件。
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -115,13 +115,16 @@
        
        //查看客户资料
        function Viewkaipiao(Keyid, SellerOrderId) {
           // window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
            top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
        function Viewkaipiao(Keyid, SellerOrderId, yongtu) {
            //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
            if (yongtu == "外协加工费") {
                top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "查看订单", Width: 1080, Height: 650 });
            }
        }
        //查看
        function onView(keyid, yongtu) {
            if (yongtu != "其他付款") {
            if (yongtu != "其他付款" && yongtu != "外协加工费") {
                top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "查看供应商", Width: 950, Height: 650 });
            }
           
@@ -181,7 +184,16 @@
                        <input id='txtCreatorName' runat="server" maxlength='50' />
                    </td>
                    
                    <td class="ali03">
                       付款用途:
                    </td>
                    <td>
                         <select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
                           <option value="">全部</option>
                            <option value="外协加工费">外协加工费</option>
                            <option value="其他付款">其他付款</option>
                        </select>
                    </td>
                    
                 
@@ -318,7 +330,7 @@
                                
                                <td>
                                    
                                      <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'>  查看订单   </a>" %>
                                      <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\")'>   查看订单   </a>" %>
                                    
                                  
                                </td>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
@@ -557,7 +557,7 @@
                PageSize = UCPager1.AspNetPager.PageSize,
                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
            };
            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPageweikaipiao(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,"");
            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPageweikaipiao(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,"", this.selFukuanyongtu.Value);
            rptData.DataSource = result;
            rptData.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs
@@ -78,6 +78,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatorName;
        /// <summary>
        /// selFukuanyongtu 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selFukuanyongtu;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
New file
@@ -0,0 +1,203 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewWaixieExpenses.aspx.cs" Inherits="CY.WebForm.Pages.financial.NewWaixieExpenses" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>外协付款</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <style type="text/css">
        .table2 td{ text-align:left; padding:3px 2px;}
    </style>
    <script type="text/javascript">
        var accountsTypes = false;
        var accounts = false;
        $(function () {
            if ('1' == document.getElementById('txtResult').value) {
                CloseOpenWindow(true);
                return;
            } else;
            document.getElementById('txtReceiveDate').value = new Date().ToString("yyyy-MM-dd HH:mm");
            //document.getElementById('txtReceiveMoney').value = document.getElementById('txtReciveMoney').value;
           /* document.getElementById('txtReceiveMoney').focus();*/
            accountsTypes = '<%=Request.RequestContext.RouteData.DataTokens["accountsTypes"] %>';
            accounts = '<%=Request.RequestContext.RouteData.DataTokens["accounts"] %>';
            try {
                accountsTypes = eval(accountsTypes);
                accounts = eval(accounts)[0];
            } catch (e) {
                accountsTypes = 'object' == typeof (accountsTypes) ? accountsTypes : [];
                accounts = [];
            }
        });
        /*
        验证输入价格
        */
        function ValidateInputPrice(txt) {
            if (!ValidateDecimal(txt)) return; else;
            try {
                var inputPrice = parseFloat(txt.value);
                var unPayed = parseFloat(document.getElementById('txtReciveMoney').value);
                txt.value = isNaN(inputPrice) || isNaN(unPayed) ? 0 : txt.value;
                if (inputPrice > unPayed) { alertMsg(' 本次收款金额大于订单未付款!<br/>为了您的账务正确性请重新复查!'); }
            } catch (e) {
            }
        }
    </script>
</head>
<body style='margin: 0; padding: 0;'>
    <form id="form1" runat="server" onsubmit="if(false)return false;">
    <input type="hidden" id='txtResult' value='<%=Request.RequestContext.RouteData.DataTokens["IsWin"] %>'>
    <table class="tableStyle" style="margin: 5px 0;">
        <tr>
            <td class="ali03 ">
                外协单数:
            </td>
            <td>
                <span class="moneystyle" id="spanCountRe" runat="server"></span>
                  <input type="hidden"  id="Keyid" runat="server" />
            </td>
        </tr>
        <tr>
            <td class="ali03 ">
                总金额:
            </td>
            <td>
                <span class="moneystyle" id="spanAllMoney" runat="server">¥</span>
            </td>
        </tr>
        <tr>
            <td class="ali03 ">
                未付金额:
            </td>
            <td>
                <span class="moneystyle" id="spanReceiveMoney" runat="server">¥</span>
            </td>
        </tr>
         <tr>
            <td class="ali03 ">
                收取金额:
            </td>
            <td >
                <asp:TextBox TextMode="SingleLine"  id="txtReciveMoney" runat="server" class="req float" min="0" ReadOnly="true"   ></asp:TextBox>
            </td>
        </tr>
        <tr>
                <td class="ali03 ">
                    有无发票:
                </td>
                <td>
                    <input runat="server" id="txtYouwufapiao" type="text" style="width: 259px" readonly="readonly" />
                </td>
            </tr>
            <tr>
               <%-- <td style=" text-align:right;">
                    付款方式:
                </td>
                <td colspan="5">
                    <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" /><label for='rdoReceiveWay0'>预付款</label>
                    (剩余预付款:<span id="nowCustomMoney" runat="server" class="moneystyle"></span>)
                </td>--%>
                <td class="ali03 ">
                    账户类型:
                </td>
                <td>
                    <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="请选择账户类型">
                    </select>
                </td>
                </tr>
            <tr>
                <td class="ali03 ">
                    账户名称:
                </td>
                <td>
                    <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="请选择账户名称">
                        <option value="">请选择</option>
                    </select>
                </td>
                </tr>
            <tr>
                <td class="ali03 ">
                    科目名称:
                </td>
                <td>
                    <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="请选择科目名称">
                    </select>
                </td>
            </tr>
         <tr>
            <td class="ali03 ">
                    有无发票:
                </td>
           <td>
            <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2'   /><label for='rdoReceiveQuannbu0'>有</label>
             <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1'   checked="checked"   /><label for='rdoReceiveQuannbu1'>无</label>
        </td>
    </tr>
            <tr>
                <td style=" text-align:right; vertical-align: top;">
                    付款日期:
                </td>
                <td   align="left">
                    <input class='date' id="txtReceiveDate" runat="server" maxlength='20' datefmt="yyyy-MM-dd HH:mm" />
                </td>
            </tr>
            <tr>
                <td style=" text-align:right;">
                    付款备注:
                </td>
                <td   align="left">
                    <textarea id='txtRemark' runat="server" onblur='Restrict(this,200)' class='remark' style='height: 30px; width: 440px;'></textarea>
                </td>
            </tr>
            <tr>
                <td>
                </td>
                <td   align="left">
                <input type="button" value="确认付款" runat="server"   id='btnSubmit' />
                </td>
            </tr>
    </table>
    </form>
     <script language="javascript" type="text/javascript">
         function ChangeThisType(obj) {
             $("#selAccountName").html("<option value=''>请选择</option>");
             $.ajax({
                 url: "/Pages/financial/NewWaixieExpenses.aspx",
                 type: "POST",
                 dataType: "html",
                 data: { TypeName: $(obj).val(), DataType: "change" },
                 global: false,
                 cache: false,
                 success: function (data) {
                     var myobj = eval('(' + data + ')');
                     if (myobj != null && myobj.length > 0) {
                         for (var i = 0; i < myobj.length; i++) {
                             var city_keyid = myobj[i].Keyid;
                             var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
                             var option = "";
                             option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
                             $(option).appendTo($("#selAccountName"));
                         }
                     }
                 }
             });
         }
    </script>
    <script type="text/javascript">
        $(function () {
            ChangeThisType("#selAcoountType");
        });
    </script>
</body>
</html>
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
New file
@@ -0,0 +1,348 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL.EC;
using CY.Infrastructure.Common;
using CY.Model;
using CY.BLL.OA;
using CY.BLL.Sys;
using System.Text;
using CY.BLL;
using System.Data;
using System.Transactions;
namespace CY.WebForm.Pages.financial
{
    //吴辉
    //外协预付款
    public partial class NewWaixieExpenses : BasePage
    {
        private EC_OrderBasicBLL _eC_OrderBasicBLL = null;
        private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
        OA_FirmAccountBLL _OA_FirmAccountBLL = null;
        OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
        OA_FirmAccountRecord firmAccountRecord = null;
        OA_FirmAccount firmAccount = null;
        OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
        string orderNo = string.Empty;
        decimal? AllMoney = 0;
        decimal? ReceiveMoney = 0;
        /// <summary>
        /// 初始化构造
        /// </summary>
        public NewWaixieExpenses()
        {
            bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
            _OA_FirmAccountBLL = new OA_FirmAccountBLL();
            firmAccountRecord = new OA_FirmAccountRecord();
            _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
            _fukuanshenqingBLL = new OA_FukuanshenqingBLL();
        }
        /// <summary>
        /// 界面加载事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        protected void Page_Load(object sender, EventArgs e)
        {
            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
            btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
            try
            {
                switch (Request["DataType"])
                {
                    case "change":
                        Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
                        break;
                    default://一般情况不处理
                        if (IsPostBack || IsCallback)
                            return;
                        else
                        {
                            LoadOrder();
                            InitialData();
                        }
                        return;
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                Response.Clear();
                Response.Write("-1");
            }
            Response.End();
            InitPage();
        }
        protected void InitialData()
        {
            //科目名称
            Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
            OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
            OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
            selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "贷");
            selSubject.DataBind();
            selSubject.Items.Insert(0, new ListItem("请选择", ""));
            ///账户类型
            selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("账户类型");
            selAcoountType.DataBind();
            //selAcoountType_SelectedIndexChanged(null, null);
        }
        protected string reLoadAccountName(string selAcoountType)
        {
            return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
        }
        /// <summary>
        /// 提交按钮点击事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        void btnSubmit_ServerClick(object sender, EventArgs e)
        {
            //_orderBasic = new EC_OrderBasic();
            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
            //_orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
            //string orderno = "";
            //string sellerName = "";
            if(string.IsNullOrEmpty(Request["selAccountName"]))
            {
                JavaScript.MessageBox("请选择账户", this);
                return;
            }
            firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
            var money = this.txtReciveMoney.Text.ToDecimal2();
            if (this.txtReciveMoney.Text.ToDecimal2() > 0 && firmAccount.Balance < this.txtReciveMoney.Text.ToDecimal2())
            {
                JavaScript.MessageBox("账户余额不足", this);
                return;
            }
            var ssss = false;
            var id = this.Keyid.Value.ToInt32().Value;
            var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
            var Youwufapiao = Request["rdoReceiveQuannbu"];
            if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
            {
                JavaScript.MessageBox("已经保存为有发票,无法修改为无发票!", this);
                return;
            }
            string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
    new TransactionOptions
    {
        IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
        Timeout = TransactionManager.MaximumTimeout
    }
    ))
            {
                try
                {
                    var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
                    fukuanshenqing.Yishoumoney = yishoumoney + money;
                    if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                    {
                        fukuanshenqing.FukuanStatus = 2;
                    }
                    fukuanshenqing.Updater = CurrentUser.ShortName;
                    fukuanshenqing.LastUpdateTime = DateTime.Now;
                    fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
                    ssss = _fukuanshenqingBLL.UpdateModel(fukuanshenqing);
                    if(this.txtReciveMoney.Text.ToDecimal2() > 0)
                    {
                        foreach (var item in Keys)
                        {
                            if (!string.IsNullOrEmpty(item))
                            {
                                var orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
                                if (orderBasic != null)
                                {
                                    firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
                                    firmAccountRecord.LastUpdateTime = DateTime.Now;
                                    firmAccountRecord.Money = orderBasic.UnPayedMoney;
                                    orderNo = orderBasic.SellerOrderId;
                                    firmAccountRecord.OperationalMatters = "外协付款" + "(" + orderNo + ")";
                                    firmAccountRecord.Operator = CurrentUser.ShortName;
                                    firmAccountRecord.PaymentUnit = orderBasic.SellerName;
                                    firmAccountRecord.RecordTypeId = 2;//支出
                                    firmAccountRecord.Remark = this.txtRemark.Value;
                                    firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
                                    firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
                                    firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
                                    firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
                                    ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
                                    if (ssss)
                                    {
                                        UsePrepare(orderBasic);
                                    }
                                    else
                                    {
                                        JavaScript.MessageBox("添加失败", this);
                                        return;
                                    }
                                }
                            }
                        }
                    }
                    if (ssss)
                    {
                        scope.Complete();
                        JavaScript.MessageBox("付款成功", this, "top.frmright.ReLoad();top.Dialog.close();");
                    }
                    else
                        JavaScript.MessageBox("添加失败", this);
                }
                catch (Exception ex)
                {
                    PAGEHandleException(ex);
                    JavaScript.MessageBox("添加失败", this);
                }
                finally
                {
                    scope.Dispose();
                }
            }
        }
        /// <summary>
        /// 加载页面数据
        /// </summary>
        private void InitPage()
        {
            try
            {
                Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
                //OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
                OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
                int i = -1;
                //账户类型
                List<Sys_Dictionary> accountsType = _Sys_DictionaryBLL.GetDataByType("账户类型") as List<Sys_Dictionary>;
                Request.RequestContext.RouteData.DataTokens.Add("accountsTypes", null == accountsType || accountsType.Count == 0 ? "[]" : JsonHelper.GetJsonStringByObject(accountsType));
                List<OA_FirmAccount> firmAccounts = oA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, "") as List<OA_FirmAccount>;
                const string ACCOUNTSJSONKEY = "accounts";
                if (null == firmAccounts)
                {
                    Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, "[]");
                    return;
                }
                IEnumerable<IGrouping<string, OA_FirmAccount>> groupings = firmAccounts.GroupBy(fa => fa.AccountType);
                StringBuilder builder = new StringBuilder();
                foreach (IGrouping<string, OA_FirmAccount> groupitem in groupings)
                {
                    OA_FirmAccount[] items = groupitem.ToArray();
                    builder.AppendFormat("{0}\"{2}\":{3}{1}", ",", "", groupitem.Key, JsonHelper.GetJsonStringByObject(items));
                }
                builder.Append("}]");
                builder.Replace(",", "[{", 0, 1);
                Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, null == firmAccounts ? "[]" : builder.ToString());
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
            }
        }
        /// <summary>
        /// 加载订单
        /// </summary>
        private void LoadOrder()
        {
            var id = Request["id"];
            var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value);
            if (fukuanshenqing != null)
            {
                this.Keyid.Value = id;
                this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
                string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
                foreach (var item in Keys)
                {
                    if (!string.IsNullOrEmpty(item))
                    {
                        var orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
                        if (orderBasic != null)
                        {
                            var sumPrice = orderBasic.SumPrice ?? 0;
                            AllMoney += sumPrice;
                            ReceiveMoney += orderBasic.UnPayedMoney;
                        }
                    }
                }
                this.spanAllMoney.InnerText = "¥" + AllMoney.Value.ToString("0.00");
                this.spanReceiveMoney.InnerText = "¥" + ReceiveMoney.Value.ToString("0.00");
                this.txtReciveMoney.Text = ReceiveMoney.Value.ToString("0.00");
                this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 单";
            }
        }
        /// <summary>
        /// 使用预付款(付款、收款)
        /// </summary>
        /// <returns></returns>
        private bool UsePrepare(EC_OrderBasic orderBasic)
        {
            int operatTypeId = 3;
            string subject = "订单付款";
            switch (Request["outsourceType"])
            {
                case "1":
                    operatTypeId = 2;
                    subject = "外协付款";
                    break;
                default:
                    break;
            }
            return _eC_OrderBasicBLL.ReceiveMoney(orderBasic.SellerId, orderBasic.BuyerId, orderBasic.Keyid.Value, orderBasic.UnPayedMoney, operatTypeId, subject, CurrentUser.ShortName); ;// _eC_OrderBasicBLL.ReceiveMoney(_orderBasic.SellerId, _orderBasic.BuyerId, _orderBasic.Keyid.Value, money.Value, operatTypeId, subject, CurrentUser.ShortName);
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
New file
@@ -0,0 +1,152 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.financial
{
    public partial class NewWaixieExpenses
    {
        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// spanCountRe 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCountRe;
        /// <summary>
        /// Keyid 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden Keyid;
        /// <summary>
        /// spanAllMoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
        /// <summary>
        /// spanReceiveMoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
        /// <summary>
        /// txtReciveMoney 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
        /// <summary>
        /// txtYouwufapiao 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtYouwufapiao;
        /// <summary>
        /// selAcoountType 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
        /// <summary>
        /// selAccountName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
        /// <summary>
        /// selSubject 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
        /// <summary>
        /// txtReceiveDate 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveDate;
        /// <summary>
        /// txtRemark 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
        /// <summary>
        /// btnSubmit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
@@ -78,8 +78,8 @@
                    有无发票:
                </td>
           <td>
            <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2' checked="checked"    /><label for='rdoReceiveQuannbu0'>有</label>
             <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1'    /><label for='rdoReceiveQuannbu1'>无</label>
            <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2'   /><label for='rdoReceiveQuannbu0'>有</label>
             <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1'   checked="checked"   /><label for='rdoReceiveQuannbu1'>无</label>
        </td>
    </tr>
            <tr style="display: none">
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs
@@ -36,17 +36,26 @@
        protected void InitialData()
        {
            var ssss  = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
            //仓库
            dwWarehouse.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
            dwWarehouse.DataSource = ssss;
            dwWarehouse.DataValueField = "Keyid";
            dwWarehouse.DataTextField = "WarehouseName";
            dwWarehouse.DataBind();
            dwWarehouse.Items.Insert(0, new ListItem("请选择", ""));
            var aaa = ssss.FirstOrDefault(x => x.WarehouseName == "上机使用");
            if (aaa != null)
            {
                dwWarehouse.SelectedValue = aaa.Keyid.Value.ToString();
            }
        }
        protected void btn_config_Click(object sender, EventArgs e)
        {
            string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
            if (bll_OA_OutOfStorageBLL.InsertModelList(Keys, dwWarehouse.SelectedValue.ToInt32()))
            var  name   = dwWarehouse.SelectedItem.Text;
            if (bll_OA_OutOfStorageBLL.InsertModelList(Keys, dwWarehouse.SelectedValue.ToInt32(), name))
            {
                JavaScript.MessageBox("操作成功", this, "Refreshss();top.Dialog.close();");
            }
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
@@ -11,19 +11,20 @@
    <table class="tableStyle1" style=" width:98%;">
        <tr>
            <td class="ali03  w100px">
                供应商:
            </td>
            <td>
                <select id="selSuppliers" runat="server" class="w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商">
                </select>
            </td>
            <td class="ali03  w100px">
                货品类别:
            </td>
            <td>
                <asp:DropDownList runat="server" ID="dwCommity" class="Sreq w120px" AutoPostBack="true" keepDefaultStyle="true" OnSelectedIndexChanged="dwCommity_SelectedIndexChanged" msg="请选择货品类别">
                </asp:DropDownList>
            </td>
            <td class="ali03  w100px">
                供应商:
            </td>
            <td>
                <select id="selSuppliers" runat="server" class="w160px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商">
                </select>
            </td>
        </tr>
        <tr>
            <td class="ali03 w100px">
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
@@ -33,15 +33,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// selSuppliers 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
        /// <summary>
        /// dwCommity 控件。
        /// </summary>
        /// <remarks>
@@ -51,6 +42,15 @@
        protected global::System.Web.UI.WebControls.DropDownList dwCommity;
        /// <summary>
        /// selSuppliers 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
        /// <summary>
        /// dwGoodsList 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -18,10 +18,10 @@
                }
                if ($(this).val() == "15") {
                    
                    $("#trShoukuandanwei").css("display", "table-row");
                    $(".trShoukuandanwei").css("display", "table-row");
                } else {
                   
                    $("#trShoukuandanwei").css("display", "none");
                    $(".trShoukuandanwei").css("display", "none");
                }
                
@@ -36,12 +36,63 @@
            }
            if ($("#selPlanDataType").val() == "15") {
                $("#trShoukuandanwei").css("display", "table-row");
                $(".trShoukuandanwei").css("display", "table-row");
            } else {
                $("#trShoukuandanwei").css("display", "none");
                $(".trShoukuandanwei").css("display", "none");
            }
            SelectAddSearch();
        });
        function custormerChange(sel) {
           // var selectedValue = $('#selectId').val();
            var selectedText = $('#selSuppliers option:selected').text();
            $("#txtShoukuandanwei").val(selectedText);
        }
        //为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);
                });
            });
        }
    </script>
</head>
<body>
@@ -88,7 +139,7 @@
                <select id="selPlanTitle" runat="server" keepdefaultstyle="true" style=" width:100px;"></select>
                </td>
            </tr>
            <tr id="trShoukuandanwei" style=" display:none;">
            <tr class="trShoukuandanwei" style=" display:none;">
                <td class="ali03">
                   收款单位:
                </td>
@@ -96,6 +147,11 @@
                 <input id="txtShoukuandanwei" type="text" style=" width:400px;" class="" runat="server" msg="请输入收款单位" maxlength="50" />
                </td>
            </tr>
             <tr class="trShoukuandanwei"  style=" display:none;">
                    <td class="ali03">选择供应商:</td>
                    <td colspan="3"> <select keepdefaultstyle='true' id='selSuppliers' runat="server"  datatextfield='Name' datavaluefield='Keyid'  onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True"  style=" width:183px;"  >
                        </select></td>
                </tr>
            <tr>
                <td class="ali03">
                    请示内容:
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -13,6 +13,7 @@
using CY.BLL.EC;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
using CY.BLL.OA;
namespace CY.WebForm.Pages.work
{
@@ -26,7 +27,7 @@
        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
        OA_WorkPlanBll oA_WorkReminderBll = null;
        OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
        OA_SuppliersBLL _OA_SuppliersBLL = null;
        public MyRequestAdd()
        {
            departmentBll = new OA_DepartmentBll();
@@ -34,6 +35,7 @@
            oA_WorkReminderBll = new OA_WorkPlanBll();
            oA_StaffBLL = new OA_StaffBLL();
            bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
            _OA_SuppliersBLL = new OA_SuppliersBLL();
        }
        //页面加载
@@ -46,6 +48,12 @@
                this.selPlanTitle.DataTextField = "ParName";
                this.selPlanTitle.DataBind();
                this.selPlanTitle.Items.Insert(0, new ListItem("全部", ""));
                //供应商
                this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
                this.selSuppliers.DataBind();
                this.selSuppliers.Items.Insert(0, new ListItem("全部", ""));
                InitData();
            }
        }
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -87,6 +87,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtShoukuandanwei;
        /// <summary>
        /// selSuppliers 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
        /// <summary>
        /// txtPlanContent 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -13,12 +13,12 @@
        //添加
        function addModel() {
            top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "新增请示", Width: 550, Height: 260 });
            top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "新增请示", Width: 550, Height: 360 });
        }
        //修改
        function onEdit(keyid) {
            top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "修改请示", Width: 550, Height: 260 });
            top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "修改请示", Width: 550, Height: 360 });
        }
        //删除