张薇按我这个界面比例画图
生产要求只填1行就够了,其他跟之前的一样
这个地方是增加或者删除不需要的后道
25个文件已修改
6个文件已添加
1833 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerHoudaosDAL.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialHoudaosDAL.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/CY.Model.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_MergerHoudaos.cs 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_SpecialHoudaos.cs 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerHoudaosDAL.cs 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialForumsDAL.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialHoudaosDAL.cs 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx 126 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx 213 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs 165 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx 174 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
@@ -103,9 +103,9 @@
        /// <param name="acceptWayByOrder"></param>
        /// <param name="orderPrintParameter"></param>
        /// <returns></returns>
        public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList)
        public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
        {
            return idal_IEC_MergerSingleDAL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, orderBasic, acceptWayByOrder, orderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList);
            return idal_IEC_MergerSingleDAL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, orderBasic, acceptWayByOrder, orderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList, m_EC_MergerHoudaosList);
        }
         /// <summary>
@@ -114,9 +114,9 @@
        /// <param name="m_EC_MergerSingle"></param>
        /// <param name="m_EC_MergerOrdersList"></param>
        /// <returns></returns>
        public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
        {
            return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList,  m_EC_MergerForumsList,  m_OA_InventoryList,  m_OA_OutOfStorageList);
            return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList,  m_EC_MergerForumsList,  m_OA_InventoryList,  m_OA_OutOfStorageList,m_EC_MergerHoudaosList);
        }
        /// <summary>
@@ -150,5 +150,15 @@
        {
            return idal_IEC_MergerSingleDAL.GetEC_MergerForumsListByKeyid(Keyid);
        }
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_MergerHoudaos> GetEC_MergerHoudaosListByKeyid(int? Keyid)
        {
            return idal_IEC_MergerSingleDAL.GetEC_MergerHoudaosListByKeyid(Keyid);
        }
    }
}
CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs
@@ -99,9 +99,9 @@
        /// <param name="m_OA_OrderWorkListRelation"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        public bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList)
        {
            return idal_IEC_SpecialOrdersDAL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList);
            return idal_IEC_SpecialOrdersDAL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_SpecialHoudaosList);
        }
         /// <summary>
@@ -110,9 +110,9 @@
        /// <param name="m_EC_SpecialOrders"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        public bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList)
        {
            return idal_IEC_SpecialOrdersDAL.UpdateSpecialForums(m_EC_SpecialOrders, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList);
            return idal_IEC_SpecialOrdersDAL.UpdateSpecialForums(m_EC_SpecialOrders, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_SpecialHoudaosList);
        }
        /// <summary>
@@ -126,5 +126,17 @@
        {
            return idal_IEC_SpecialOrdersDAL.SelectModelPage(pagination,MemberId,PrintName,CustomName,PSO_OrderNum,beginTime,endTime, PSF_PressesDesk);
        }
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_SpecialHoudaos> GetEC_SpecialHoudaosListByKeyid(int? Keyid)
        {
            return idal_IEC_SpecialOrdersDAL.GetEC_SpecialHoudaosListByKeyid(Keyid);
        }
    }
}
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -45,6 +45,8 @@
    <Compile Include="EC\IEC_BusinessLimitsBasicInfoDAL.cs" />
    <Compile Include="EC\IEC_DemandDescribeDAL.cs" />
    <Compile Include="EC\IEC_DemandQuoteDAL.cs" />
    <Compile Include="EC\IEC_SpecialHoudaosDAL.cs" />
    <Compile Include="EC\IEC_MergerHoudaosDAL.cs" />
    <Compile Include="EC\IEC_MergerForumsDAL.cs" />
    <Compile Include="EC\IEC_OnlineAdviserDAL.cs" />
    <Compile Include="EC\IEC_OrderDialogueDAL.cs" />
CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerHoudaosDAL.cs
New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IBaseDAL;
using CY.Model;
namespace CY.IDAL
{
    /// <summary>
    /// 专版施工单版面-数据库操作接口
    /// </summary>
    public interface IEC_MergerHoudaosDAL : ICommonDAL, IPaging<EC_MergerHoudaos>, IGetAllModel<EC_MergerHoudaos>
    {
    }
}
CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
@@ -52,7 +52,7 @@
        /// <param name="acceptWayByOrder"></param>
        /// <param name="orderPrintParameter"></param>
        /// <returns></returns>
        bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList);
        bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList);
        /// <summary>
        /// 修改合版施工单
@@ -60,7 +60,7 @@
        /// <param name="m_EC_MergerSingle"></param>
        /// <param name="m_EC_MergerOrdersList"></param>
        /// <returns></returns>
        bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList);
        bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList);
        /// <summary>
        /// 分页查询
@@ -85,5 +85,13 @@
        /// <param name="Keyid"></param>
        /// <returns></returns>
        IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid);
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        IEnumerable<Model.EC_MergerHoudaos> GetEC_MergerHoudaosListByKeyid(int? Keyid);
    }
}
CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialHoudaosDAL.cs
New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IBaseDAL;
using CY.Model;
namespace CY.IDAL
{
    /// <summary>
    /// 专版施工单版面-数据库操作接口
    /// </summary>
    public interface IEC_SpecialHoudaosDAL : ICommonDAL, IPaging<EC_SpecialHoudaos>, IGetAllModel<EC_SpecialHoudaos>
    {
    }
}
CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs
@@ -44,14 +44,14 @@
        /// <param name="m_OA_OrderWorkListRelation"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList);
        bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList);
         /// <summary>
        /// 修改专版施工单
        /// </summary>
        /// <param name="m_EC_SpecialOrders"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList);
        bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList);
        /// <summary>
        /// 分页查询
        /// </summary>
@@ -60,5 +60,15 @@
        /// <returns></returns>
        IEnumerable<Model.EC_SpecialOrders> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, string PrintName, string
             CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime, string PSF_PressesDesk);
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        IEnumerable<Model.EC_SpecialHoudaos> GetEC_SpecialHoudaosListByKeyid(int? Keyid);
    }
}
CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -58,6 +58,8 @@
    <Compile Include="EC\EC_FirmInfo.cs" />
    <Compile Include="EC\EC_MemberBasic.cs" />
    <Compile Include="EC\EC_MemberExtend.cs" />
    <Compile Include="EC\EC_MergerHoudaos.cs" />
    <Compile Include="EC\EC_SpecialHoudaos.cs" />
    <Compile Include="EC\EC_MergerForums.cs" />
    <Compile Include="EC\EC_OnlineAdviser.cs" />
    <Compile Include="EC\EC_OrderBasic.cs" />
CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs
@@ -64,6 +64,8 @@
        public string shifouxianshilunzhuan { get; set; }
        public string PSF_Fabantaoshu { get; set; }
        /// <summary>
        /// 主键--标识ID
        /// </summary>
@@ -438,6 +440,11 @@
                this.PSF_PaperId = isChange ? MyConvert.ConvertToInt32(value) : PSF_PaperId;
                theValue = this.PSF_PaperId;
            }
            else if ("PSF_Fabantaoshu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 33)
            {
                this.PSF_Fabantaoshu = isChange ? MyConvert.ConvertToString(value) : PSF_Fabantaoshu;
                theValue = this.PSF_Fabantaoshu;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.Model/EC/EC_MergerHoudaos.cs
New file
@@ -0,0 +1,111 @@
/**
* EC_MergerForums.cs
*
* 功 能: N/A
* 类 名: EC_MergerForums
*
* Ver    变更日期             负责人  变更内容
* ───────────────────────────────────
* V0.01  2013-4-2 14:27:31   N/A    初版
*
*
*
*
*
*
*/
using System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;
namespace CY.Model
{
    /// <summary>
    /// 专版施工单版面
    /// </summary>
    [Serializable]
    public partial class EC_MergerHoudaos : IAggregateRoot
    {
        public EC_MergerHoudaos()
        { }
        #region Model
        /// <summary>
        /// 主键--标识ID
        /// </summary>
        public int? Keyid
        {
            set;
            get;
        }
        public int? MergerOrderId { get; set; }
        public string PSF_Houdaogongxu { get; set; }
        public string PSF_Shuliang { get; set; }
        public string PSF_Beishu { get; set; }
        public string PSF_Jichang { get; set; }
        public string PSF_Yaoqiu { get; set; }
        #endregion Model
        #region Visiter
        /// <summary>
        /// 属性访问器
        /// </summary>
        /// <param name="name">属性名</param>
        /// <param name="index">索引</param>
        /// <param name="isChange">是否将指定属性设置为传入值</param>
        /// <param name="value">需要赋予的值</param>
        /// <returns>与名称对应的属性值</returns>
        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
        {
            object theValue = null;
            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
            {
                this.Keyid = isChange ? MyConvert.ConvertToInt32(value) : Keyid;
                theValue = this.Keyid;
            }
            else if ("MergerOrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
            {
                this.MergerOrderId = isChange ? MyConvert.ConvertToInt32(value) : MergerOrderId;
                theValue = this.MergerOrderId;
            }
            else if ("PSF_Houdaogongxu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
            {
                this.PSF_Houdaogongxu = isChange ? MyConvert.ConvertToString(value) : PSF_Houdaogongxu;
                theValue = this.PSF_Houdaogongxu;
            }
            else if ("PSF_Shuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
            {
                this.PSF_Shuliang = isChange ? MyConvert.ConvertToString(value) : PSF_Shuliang;
                theValue = this.PSF_Shuliang;
            }
            else if ("PSF_Beishu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
            {
                this.PSF_Beishu = isChange ? MyConvert.ConvertToString(value) : PSF_Beishu;
                theValue = this.PSF_Beishu;
            }
            else if ("PSF_Jichang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
            {
                this.PSF_Jichang = isChange ? MyConvert.ConvertToString(value) : PSF_Jichang;
                theValue = this.PSF_Jichang;
            }
            else if ("PSF_Yaoqiu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
            {
                this.PSF_Yaoqiu = isChange ? MyConvert.ConvertToString(value) : PSF_Yaoqiu;
                theValue = this.PSF_Yaoqiu;
            }
            return theValue;
        }
        #endregion
    }
}
CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
@@ -64,6 +64,8 @@
        public string shifouxianshilunzhuan { get; set; }
        public string PSF_Fabantaoshu { get; set; }
        /// <summary>
        /// 主键--标识ID
        /// </summary>
@@ -438,6 +440,11 @@
                this.PSF_PaperId = isChange ? MyConvert.ConvertToInt32(value) : PSF_PaperId;
                theValue = this.PSF_PaperId;
            }
            else if ("PSF_Fabantaoshu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 33)
            {
                this.PSF_Fabantaoshu = isChange ? MyConvert.ConvertToString(value) : PSF_Fabantaoshu;
                theValue = this.PSF_Fabantaoshu;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.Model/EC/EC_SpecialHoudaos.cs
New file
@@ -0,0 +1,111 @@
/**
* EC_MergerForums.cs
*
* 功 能: N/A
* 类 名: EC_MergerForums
*
* Ver    变更日期             负责人  变更内容
* ───────────────────────────────────
* V0.01  2013-4-2 14:27:31   N/A    初版
*
*
*
*
*
*
*/
using System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;
namespace CY.Model
{
    /// <summary>
    /// 专版施工单版面
    /// </summary>
    [Serializable]
    public partial class EC_SpecialHoudaos : IAggregateRoot
    {
        public EC_SpecialHoudaos()
        { }
        #region Model
        /// <summary>
        /// 主键--标识ID
        /// </summary>
        public int? Keyid
        {
            set;
            get;
        }
        public int? SpecialOrderId { get; set; }
        public string PSF_Houdaogongxu { get; set; }
        public string PSF_Shuliang { get; set; }
        public string PSF_Beishu { get; set; }
        public string PSF_Jichang { get; set; }
        public string PSF_Yaoqiu { get; set; }
        #endregion Model
        #region Visiter
        /// <summary>
        /// 属性访问器
        /// </summary>
        /// <param name="name">属性名</param>
        /// <param name="index">索引</param>
        /// <param name="isChange">是否将指定属性设置为传入值</param>
        /// <param name="value">需要赋予的值</param>
        /// <returns>与名称对应的属性值</returns>
        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
        {
            object theValue = null;
            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
            {
                this.Keyid = isChange ? MyConvert.ConvertToInt32(value) : Keyid;
                theValue = this.Keyid;
            }
            else if ("SpecialOrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
            {
                this.SpecialOrderId = isChange ? MyConvert.ConvertToInt32(value) : SpecialOrderId;
                theValue = this.SpecialOrderId;
            }
            else if ("PSF_Houdaogongxu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
            {
                this.PSF_Houdaogongxu = isChange ? MyConvert.ConvertToString(value) : PSF_Houdaogongxu;
                theValue = this.PSF_Houdaogongxu;
            }
            else if ("PSF_Shuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
            {
                this.PSF_Shuliang = isChange ? MyConvert.ConvertToString(value) : PSF_Shuliang;
                theValue = this.PSF_Shuliang;
            }
            else if ("PSF_Beishu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
            {
                this.PSF_Beishu = isChange ? MyConvert.ConvertToString(value) : PSF_Beishu;
                theValue = this.PSF_Beishu;
            }
            else if ("PSF_Jichang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
            {
                this.PSF_Jichang = isChange ? MyConvert.ConvertToString(value) : PSF_Jichang;
                theValue = this.PSF_Jichang;
            }
            else if ("PSF_Yaoqiu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
            {
                this.PSF_Yaoqiu = isChange ? MyConvert.ConvertToString(value) : PSF_Yaoqiu;
                theValue = this.PSF_Yaoqiu;
            }
            return theValue;
        }
        #endregion
    }
}
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -55,6 +55,8 @@
    <Compile Include="EC\EC_DemandPrintParameterDAL.cs" />
    <Compile Include="EC\EC_InHomeDataDAL.cs" />
    <Compile Include="EC\EC_MemberBasicDAL.cs" />
    <Compile Include="EC\EC_SpecialHoudaosDAL.cs" />
    <Compile Include="EC\EC_MergerHoudaosDAL.cs" />
    <Compile Include="EC\EC_MergerForumsDAL.cs" />
    <Compile Include="EC\EC_OnlineAdviserDAL.cs" />
    <Compile Include="EC\EC_OrderDialogueDAL.cs" />
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs
@@ -63,7 +63,8 @@
                    new SqlParameter("@PSF_PSSpec",trueModel.PSF_PSSpec),
                    new SqlParameter("@PSF_PSCount",trueModel.PSF_PSCount),
                    new SqlParameter("@PSF_Note",trueModel.PSF_Note),
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId)
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId),
                    new SqlParameter("@PSF_Fabantaoshu",string.IsNullOrEmpty(trueModel.PSF_Fabantaoshu)?"":trueModel.PSF_Fabantaoshu)
            };
            try
            {
@@ -116,7 +117,8 @@
                    new SqlParameter("@PSF_PSSpec",trueModel.PSF_PSSpec),
                    new SqlParameter("@PSF_PSCount",trueModel.PSF_PSCount),
                    new SqlParameter("@PSF_Note",trueModel.PSF_Note),
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId)
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId),
                    new SqlParameter("@PSF_Fabantaoshu",string.IsNullOrEmpty(trueModel.PSF_Fabantaoshu)?"":trueModel.PSF_Fabantaoshu)
            };
            try
            {
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerHoudaosDAL.cs
New file
@@ -0,0 +1,150 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using System.Data.SqlClient;
using System.Data;
using CY.Model;
namespace CY.SQLDAL
{
    public class EC_MergerHoudaosDAL : IEC_MergerHoudaosDAL
    {
        private Database _dataBase = null;
        public EC_MergerHoudaosDAL()
        {
            _dataBase = new Database();
        }
        public EC_MergerHoudaosDAL(Database database)
        {
            _dataBase = database;
        }
        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_MergerHoudaos trueModel = model as Model.EC_MergerHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@MergerOrderId",trueModel.MergerOrderId),
                    new SqlParameter("@PSF_Houdaogongxu",trueModel.PSF_Houdaogongxu),
                    new SqlParameter("@PSF_Shuliang",trueModel.PSF_Shuliang),
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
            };
            string sql = "Insert Into EC_MergerHoudaos ([MergerOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu])"
                                             + " Values (@MergerOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu )";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_MergerHoudaos trueModel = model as Model.EC_MergerHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@Keyid",trueModel.Keyid),
                     new SqlParameter("@MergerOrderId",trueModel.MergerOrderId),
                    new SqlParameter("@PSF_Houdaogongxu",trueModel.PSF_Houdaogongxu),
                    new SqlParameter("@PSF_Shuliang",trueModel.PSF_Shuliang),
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
            };
            string sql = "Update EC_MergerHoudaos Set [MergerOrderId]=@MergerOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu where [Keyid] =@Keyid ";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_MergerHoudaos trueModel = model as Model.EC_MergerHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@Keyid",trueModel.Keyid)
            };
            string sql = "Delete EC_MergerHoudaos Where [Keyid] = @Keyid ";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_MergerHoudaos> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
        {
            throw new NotImplementedException();
        }
        /// <summary>
        /// 单个查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_MergerHoudaos> SelectAllModel(Infrastructure.Query.Query query)
        {
            throw new NotImplementedException();
        }
    }
}
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
@@ -317,7 +317,7 @@
        /// <param name="acceptWayByOrder"></param>
        /// <param name="orderPrintParameter"></param>
        /// <returns></returns>
        public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList)
        public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
        {
            try
            {
@@ -332,6 +332,7 @@
                EC_AcceptWayByOrderDAL _eC_AcceptWayByOrderDAL = new EC_AcceptWayByOrderDAL(_dataBase);
                EC_OrderOperateDAL _eC_OrderOperateDAL = new EC_OrderOperateDAL(_dataBase);
                EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_dataBase);
                EC_MergerHoudaosDAL dal_EC_MergerHoudaosDAL = new EC_MergerHoudaosDAL(_dataBase);
                EC_OrderExtend orderExtend = orderBasic.OrderExtend;
                Pay_TradingSingle tradingSingle = orderBasic.TradingSingle;
@@ -466,6 +467,21 @@
                                    return false;
                                }
                            }
                            foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList)
                            {
                                if (result)
                                {
                                    m_EC_MergerHoudaos.MergerOrderId = m_EC_MergerSingle.Keyid;
                                    result = dal_EC_MergerHoudaosDAL.InserModel(m_EC_MergerHoudaos);
                                }
                                else
                                {
                                    return false;
                                }
                            }
                        }
                    }
                    else
@@ -519,16 +535,18 @@
        /// <param name="m_EC_MergerSingle"></param>
        /// <param name="m_EC_MergerOrdersList"></param>
        /// <returns></returns>
        public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
        {
            try
            {
                bool result = false;
                EC_MergerOrdersDAL dal_EC_MergerOrdersDAL = new EC_MergerOrdersDAL(_dataBase);
                EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_dataBase);
                EC_MergerHoudaosDAL dal_EC_MergerHoudaosDAL = new EC_MergerHoudaosDAL(_dataBase);
                List<EC_MergerOrders> m_EC_MergerOrdersList_Old = GetEC_MergerOrdersListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerOrders>;
                List<EC_MergerForums> m_EC_MergerForumsList_Old = GetEC_MergerForumsListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerForums>;
                List<EC_MergerHoudaos> m_EC_MergerHoudaosList_Old = GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
                using (TransactionScope t_TransactionScope = new TransactionScope())
                {
                    result = UpdateModel(m_EC_MergerSingle);
@@ -565,12 +583,33 @@
                                return false;
                        }
                        foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList_Old)
                        {
                            if (result)
                            {
                                result = dal_EC_MergerHoudaosDAL.DeleteModel(m_EC_MergerHoudaos);
                            }
                            else
                                return false;
                        }
                        foreach (var m_EC_MergerForums in m_EC_MergerForumsList)
                        {
                            if (result)
                            {
                                m_EC_MergerForums.MergerOrderId = m_EC_MergerSingle.Keyid;
                                result = dal_EC_MergerForumsDAL.InserModel(m_EC_MergerForums);
                            }
                            else
                                return false;
                        }
                        foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList)
                        {
                            if (result)
                            {
                                m_EC_MergerHoudaos.MergerOrderId = m_EC_MergerSingle.Keyid;
                                result = dal_EC_MergerHoudaosDAL.InserModel(m_EC_MergerHoudaos);
                            }
                            else
                                return false;
@@ -711,5 +750,29 @@
                throw ex;
            }
        }
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_MergerHoudaos> GetEC_MergerHoudaosListByKeyid(int? Keyid)
        {
            try
            {
                if (Keyid == null)
                    return null;//错误数据返会空
                IList<EC_MergerHoudaos> result = _dataBase.SelectModel<EC_MergerHoudaos>("*", "EC_MergerHoudaos", string.Format(" MergerOrderId='{0}'", Keyid)) as IList<EC_MergerHoudaos>;//执行查询
                return result;//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
    }
}
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialForumsDAL.cs
@@ -63,7 +63,8 @@
                    new SqlParameter("@PSF_PSSpec",trueModel.PSF_PSSpec),
                    new SqlParameter("@PSF_PSCount",trueModel.PSF_PSCount),
                    new SqlParameter("@PSF_Note",trueModel.PSF_Note),
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId)
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId),
                    new SqlParameter("@PSF_Fabantaoshu",string.IsNullOrEmpty(trueModel.PSF_Fabantaoshu)?"":trueModel.PSF_Fabantaoshu)
            };
            try
            {
@@ -116,7 +117,8 @@
                    new SqlParameter("@PSF_PSSpec",trueModel.PSF_PSSpec),
                    new SqlParameter("@PSF_PSCount",trueModel.PSF_PSCount),
                    new SqlParameter("@PSF_Note",trueModel.PSF_Note),
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId)
                    new SqlParameter("@PSF_PaperId",trueModel.PSF_PaperId),
                    new SqlParameter("@PSF_Fabantaoshu",string.IsNullOrEmpty(trueModel.PSF_Fabantaoshu)?"":trueModel.PSF_Fabantaoshu)
            };
            try
            {
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialHoudaosDAL.cs
New file
@@ -0,0 +1,150 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using System.Data.SqlClient;
using System.Data;
using CY.Model;
namespace CY.SQLDAL
{
    public class EC_SpecialHoudaosDAL : IEC_SpecialHoudaosDAL
    {
        private Database _dataBase = null;
        public EC_SpecialHoudaosDAL()
        {
            _dataBase = new Database();
        }
        public EC_SpecialHoudaosDAL(Database database)
        {
            _dataBase = database;
        }
        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_SpecialHoudaos trueModel = model as Model.EC_SpecialHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@SpecialOrderId",trueModel.SpecialOrderId),
                    new SqlParameter("@PSF_Houdaogongxu",trueModel.PSF_Houdaogongxu),
                    new SqlParameter("@PSF_Shuliang",trueModel.PSF_Shuliang),
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
            };
            string sql = "Insert Into EC_SpecialHoudaos ([SpecialOrderId],[PSF_Houdaogongxu],[PSF_Shuliang],[PSF_Beishu], [PSF_Jichang], [PSF_Yaoqiu])"
                                             + " Values (@SpecialOrderId,@PSF_Houdaogongxu,@PSF_Shuliang, @PSF_Beishu, @PSF_Jichang, @PSF_Yaoqiu )";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_SpecialHoudaos trueModel = model as Model.EC_SpecialHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@Keyid",trueModel.Keyid),
                     new SqlParameter("@SpecialOrderId",trueModel.SpecialOrderId),
                    new SqlParameter("@PSF_Houdaogongxu",trueModel.PSF_Houdaogongxu),
                    new SqlParameter("@PSF_Shuliang",trueModel.PSF_Shuliang),
                    new SqlParameter("@PSF_Beishu",trueModel.PSF_Beishu),
                    new SqlParameter("@PSF_Jichang",trueModel.PSF_Jichang),
                    new SqlParameter("@PSF_Yaoqiu",trueModel.PSF_Yaoqiu),
            };
            string sql = "Update EC_SpecialHoudaos Set [SpecialOrderId]=@SpecialOrderId,[PSF_Houdaogongxu]=@PSF_Houdaogongxu,[PSF_Shuliang]=@PSF_Shuliang,[PSF_Beishu]=@PSF_Beishu, [PSF_Jichang]=@PSF_Jichang, [PSF_Yaoqiu]=@PSF_Yaoqiu where [Keyid] =@Keyid ";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.EC_SpecialHoudaos trueModel = model as Model.EC_SpecialHoudaos;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@Keyid",trueModel.Keyid)
            };
            string sql = "Delete EC_SpecialHoudaos Where [Keyid] = @Keyid ";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_SpecialHoudaos> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
        {
            throw new NotImplementedException();
        }
        /// <summary>
        /// 单个查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_SpecialHoudaos> SelectAllModel(Infrastructure.Query.Query query)
        {
            throw new NotImplementedException();
        }
    }
}
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
@@ -239,7 +239,7 @@
        /// <param name="m_OA_OrderWorkListRelation"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        public bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool AddSpecialForums(EC_OrderOperate m_EC_OrderOperate, EC_SpecialOrders m_EC_SpecialOrders, OA_OrderWorkListRelation m_OA_OrderWorkListRelation, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList)
        {
            try
            {
@@ -248,6 +248,7 @@
                EC_OrderExtendDAL dal_EC_OrderExtendDAL = new EC_OrderExtendDAL(_dataBase);
                OA_OrderWorkListRelationDAL dal_OA_OrderWorkListRelationDAL = new OA_OrderWorkListRelationDAL(_dataBase);
                EC_SpecialForumsDAL dal_EC_SpecialForumsDAL = new EC_SpecialForumsDAL(_dataBase);
                EC_SpecialHoudaosDAL dal_EC_SpecialHoudaosDAL = new EC_SpecialHoudaosDAL(_dataBase);
                using (TransactionScope t_TransactionScope = new TransactionScope())
                {
@@ -277,6 +278,21 @@
                                            return false;
                                        }
                                    }
                                    foreach (var m_EC_SpecialHoudaos in m_EC_SpecialHoudaosList)
                                    {
                                        if (result)
                                        {
                                            m_EC_SpecialHoudaos.SpecialOrderId = m_EC_SpecialOrders.Keyid;
                                            result = dal_EC_SpecialHoudaosDAL.InserModel(m_EC_SpecialHoudaos);
                                        }
                                        else
                                        {
                                            return false;
                                        }
                                    }
                                    if (result)
                                    {
                                        t_TransactionScope.Complete();
@@ -318,15 +334,18 @@
        /// <param name="m_EC_SpecialOrders"></param>
        /// <param name="m_EC_SpecialForumsList"></param>
        /// <returns></returns>
        public bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
        public bool UpdateSpecialForums(EC_SpecialOrders m_EC_SpecialOrders, List<EC_SpecialForums> m_EC_SpecialForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList, List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList)
        {
            try
            {
                bool result = false;
                EC_SpecialForumsDAL dal_EC_SpecialForumsDAL = new EC_SpecialForumsDAL(_dataBase);
                EC_SpecialHoudaosDAL dal_EC_SpecialHoudaosDAL = new EC_SpecialHoudaosDAL(_dataBase);
                List<EC_SpecialForums> m_EC_SpecialForumsList_Old = GetEC_SpecialForumsListByKeyid(m_EC_SpecialOrders.Keyid) as List<EC_SpecialForums>;
                List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList_Old = GetEC_SpecialHoudaosListByKeyid(m_EC_SpecialOrders.Keyid) as List<EC_SpecialHoudaos>;
                using (TransactionScope t_TransactionScope = new TransactionScope())
                {
                    result = UpdateModel(m_EC_SpecialOrders);
@@ -342,6 +361,18 @@
                                return false;
                        }
                        foreach (var m_EC_SpecialHoudaos in m_EC_SpecialHoudaosList_Old)
                        {
                            if (result)
                            {
                                result = dal_EC_SpecialHoudaosDAL.DeleteModel(m_EC_SpecialHoudaos);
                            }
                            else
                                return false;
                        }
                        foreach (var m_EC_SpecialForums in m_EC_SpecialForumsList)
                        {
                            if (result)
@@ -352,6 +383,18 @@
                            else
                                return false;
                        }
                        foreach (var m_EC_SpecialHoudaos in m_EC_SpecialHoudaosList)
                        {
                            if (result)
                            {
                                m_EC_SpecialHoudaos.SpecialOrderId = m_EC_SpecialOrders.Keyid;
                                result = dal_EC_SpecialHoudaosDAL.InserModel(m_EC_SpecialHoudaos);
                            }
                            else
                                return false;
                        }
                        if (result)
                        {
                            t_TransactionScope.Complete();
@@ -431,5 +474,30 @@
                throw ex;
            }
        }
        /// <summary>
        /// 根据编号获得版面信息
        /// </summary>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_SpecialHoudaos> GetEC_SpecialHoudaosListByKeyid(int? Keyid)
        {
            try
            {
                if (Keyid == null)
                    return null;//错误数据返会空
                IList<EC_SpecialHoudaos> result = _dataBase.SelectModel<EC_SpecialHoudaos>("*", "EC_SpecialHoudaos", string.Format(" SpecialOrderId='{0}'", Keyid)) as IList<EC_SpecialHoudaos>;//执行查询
                return result;//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -287,6 +287,7 @@
                </tr>
            </tbody>
        </table>
         <asp:Repeater ID="Repeater1" runat="server">
                        <ItemTemplate>
                            <table cellpadding="0" cellspacing="0" style="text-align: center;">
@@ -299,35 +300,48 @@
                                    <td rowspan="2">
                                         构件 
                                    </td>
                                    <td rowspan="2" colspan="2">
                                        P数
                                    <td rowspan="2" >
                                        页数
                                    </td>
                                    <td rowspan="2" colspan="2">
                                    <td rowspan="2" >
                                        印刷机台
                                    </td>
                                    <td colspan="2">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印色</span>
                                    <td colspan="3">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印刷要求</span>
                                    </td>
                                    <td rowspan="2" colspan="2">
                                   <%-- <td rowspan="2" colspan="2">
                                       <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>    
                                    </td>--%>
                                     <td rowspan="2" >
                                     <span  style="<%#Eval("shifouxianshi")%>" >  板材规格</span>
                                    </td>
                                     <td rowspan="2" >
                                     <span  style="<%#Eval("shifouxianshi")%>" > 数量(张) </span>
                                    </td>
                                     <td rowspan="2" >
                                        发版套数
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >正</span>
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背</span>
                                        <span  style="<%#Eval("shifouxianshi")%>" >正面色数</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背面色数</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;">
                                    <td>
                                        <%#Eval("PSF_Component")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#Eval("PSF_PressesDesk")%>
                                    </td>
                                    <td>
@@ -336,7 +350,7 @@
                                    <td>
                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
                                    </td>
                                    <td colspan="2">
                                    <td >
                                     <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>       
                                    </td>
                                    <%--<td>
@@ -348,6 +362,15 @@
                                    <td>
                                        <%#Eval("PSF_EditionCount")%>
                                    </td>--%>
                                    <td>
                                         <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >   <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
                                    </td>
                                    <td>
                                        <%#Eval("PSF_Fabantaoshu")%>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>" >
                                    <td rowspan="2">
@@ -363,7 +386,7 @@
                                      <span  style="<%#Eval("shifouxianshilunzhuan")%>" >纸张数量(张)</span>       
                                    </td>
                                    <td colspan="4">
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格</span>
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格(mm)</span>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
@@ -380,10 +403,10 @@
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开数</span>      
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度(mm)</span>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度</span>
                                    </td>
                                    <td>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度(mm)</span>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
@@ -418,7 +441,7 @@
                                        <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                              <%--  <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >版材类型</span>
                                    </td>
@@ -436,7 +459,7 @@
                                    </td>
                                    <td colspan="6">
                                    </td>
                                    <tr>
                                    </tr>
                                        <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
                                            <td>
                                               <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
@@ -455,7 +478,7 @@
                                            </td>
                                            <td colspan="6">
                                            </td>
                                        </tr>
                                        </tr>--%>
                                        <tr style="<%#Eval("shifouqitadingdan")%>">
                                            <td style="font-weight: bold; background-color: #E6E6E6;">
                                                其它订单的订单号:
@@ -464,9 +487,9 @@
                                                <%#Eval("PSF_PaperName")%>
                                            </td>
                                        </tr>
                                        <tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
                                        <tr style=" display:none;">
                                            <td style="font-weight: bold; background-color: #E6E6E6;">
                                                注意事项:
                                                生产要求:
                                            </td>
                                            <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
                                                <%#Eval("PSF_Note")%>
@@ -475,6 +498,71 @@
                            </table>
                        </ItemTemplate>
                    </asp:Repeater>
               <table  cellpadding="0" cellspacing="0" style="text-align: left;width: 100%;<%=tablesee%>">
                        <tbody>
                            <tr>
                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;" rowspan="<%=therowspan %>">
                                                后道工序:
                                            </td>
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                             <td>
                            <%#Eval("PSF_Houdaogongxu")%>
                    </td>
                                              <td>
                        数量: <%#Eval("PSF_Shuliang")%>
                    </td>
                                             <td>
                        倍数: <%#Eval("PSF_Beishu")%>
                    </td>
       <td>
                        机长:<%#Eval("PSF_Jichang")%>
                    </td>
                                              <td>
                       要求: <%#Eval("PSF_Yaoqiu")%>
                    </td>
                          </tr>
                          </ItemTemplate>
                </asp:Repeater>
                        </tbody>
                    </table>
                    <table cellpadding="0" cellspacing="0" style="text-align: left;" id="txtPSO_Remarks_o_TR1" runat="server" >
                      <%--  <tr style="border: none; background-color: #E4E4E4;">
                            <th colspan="1" style="text-align: left; text-indent: 5px;">
                                <b>备注</b>
                            </th>
                        </tr>--%>
                        <tbody>
                            <tr>
                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                                                生产要求:
                                            </td>
                                <td>
                                    <span runat="server" id="txtPSO_Remarks_o"></span>
                                </td>
                            </tr>
                        </tbody>
                    </table>
    </div>
    </form>
</body>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
@@ -22,7 +22,8 @@
    {
        EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
        public string therowspan = "";
        public string tablesee = "";
        //初始化
        public AgMergerOrderDetail()
        {
@@ -116,6 +117,15 @@
            this.spanPMS_TotalPrice.InnerText = (m_EC_MergerSingle.PMS_TotalPrice ?? 0).ToString("0.00");
            this.spanPMS_Remarks.InnerText = m_EC_MergerSingle.PMS_Remarks;
             
            if (string.IsNullOrEmpty(m_EC_MergerSingle.PMS_Remarks))
            {
                this.txtPSO_Remarks_o_TR1.Visible = false;
            }
            else
            {
                this.txtPSO_Remarks_o.InnerText = m_EC_MergerSingle.PMS_Remarks;
            }
            if (m_EC_MergerSingle.Keyid != null)
            {
                List<EC_MergerOrders> m_EC_MergerOrdersList = bll_EC_MergerSingleBLL.GetEC_MergerOrdersListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerOrders>;
@@ -169,6 +179,25 @@
                }
                this.Repeater1.DataSource = m_EC_MergerForumsList;
                this.Repeater1.DataBind();
                List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
                this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
                this.RepeaterHoudaoList.DataBind();
                if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count <= 0)
                {
                    tablesee = "display:none;";
                }
                if (m_EC_MergerHoudaosList != null)
                {
                    therowspan = (m_EC_MergerHoudaosList.Count + 1) + "";
                }
                else
                {
                    therowspan = "1";
                }
            }
            return true;
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
@@ -382,5 +382,32 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater Repeater1;
        /// <summary>
        /// RepeaterHoudaoList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepeaterHoudaoList;
        /// <summary>
        /// txtPSO_Remarks_o_TR1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTable txtPSO_Remarks_o_TR1;
        /// <summary>
        /// txtPSO_Remarks_o 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtPSO_Remarks_o;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -179,7 +179,7 @@
                            <thead>
                                <tr class="ForumName" style="display:none">
                                    <th colspan="12">
                                        <b>第<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>版<input name="PSF_Forumsid" value="<%#Container.ItemIndex + 1%>" type="hidden" value_hide_psf_component="<%#Eval("PSF_Component")%>" value_hide_psf_pressesdesk="<%#Eval("PSF_PressesDesk")%>" value_hide_psf_printedcolorpositive="<%#Eval("PSF_PrintedColorPositive")%>" value_hide_psf_printedcolorrear="<%#Eval("PSF_PrintedColorRear")%>" value_hide_psf_typesetting="<%#Eval("PSF_Typesetting")%>" value_hide_psf_papersource="<%#Eval("PSF_PaperSource")%>" value_hide_psf_openspecifications="<%#Eval("PSF_OpenSpecifications")%>" value_hide_psf_selpapername="<%#Eval("PSF_PaperName")%>" value_hide_psf_selpaperspec="<%#Eval("PSF_MaterialSpecifications")%>" value_hide_psf_selplatetype="<%#Eval("PSF_PlateSource")%>" value_hide_psf_selctpspec="<%#Eval("PSF_CTPSpecType")%>" value_hide_psf_selfilmspec="<%#Eval("PSF_FilmType")%>" /></b>
                                        <b>第<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>版<input name="PSF_Forumsid" value="<%#Container.ItemIndex + 1%>" type="hidden" value_hide_psf_component="<%#Eval("PSF_Component")%>" value_hide_psf_pressesdesk="<%#Eval("PSF_PressesDesk")%>" value_hide_psf_printedcolorpositive="<%#Eval("PSF_PrintedColorPositive")%>" value_hide_psf_printedcolorrear="<%#Eval("PSF_PrintedColorRear")%>" value_hide_psf_typesetting="<%#Eval("PSF_Typesetting")%>" value_hide_psf_fabantaoshu="<%#Eval("PSF_Fabantaoshu")%>" value_hide_psf_papersource="<%#Eval("PSF_PaperSource")%>" value_hide_psf_openspecifications="<%#Eval("PSF_OpenSpecifications")%>" value_hide_psf_selpapername="<%#Eval("PSF_PaperName")%>" value_hide_psf_selpaperspec="<%#Eval("PSF_MaterialSpecifications")%>" value_hide_psf_selplatetype="<%#Eval("PSF_PlateSource")%>" value_hide_psf_selctpspec="<%#Eval("PSF_CTPSpecType")%>" value_hide_psf_selfilmspec="<%#Eval("PSF_FilmType")%>" /></b>
                                    </th>
                                </tr>
                            </thead>
@@ -187,26 +187,37 @@
                                <td rowspan="2" style="width: 195px;">
                                 构件
                                </td>
                                <td rowspan="2" colspan="2" >
                                  P数
                                <td rowspan="2"  >
                                 页数
                                </td>
                                <td rowspan="2" colspan="2">
                                <td rowspan="2"  >
                                    印刷机台
                                </td>
                                <td colspan="2"   >
                                    <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">印色</p>
                                <td colspan="3"   >
                                     <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷要求</p>
                                </td>
                                <td rowspan="2" colspan="2">
                              <%--  <td rowspan="2" colspan="2">
                                    <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>      
                                </td>--%>
                                  <td rowspan="2"   >
                                    <p   class="lb lbCTPCount lbCTPCountc" value_ppwaerid="<%#Container.ItemIndex + 1%>">板材规格</p>
                                </td>
                                <td  rowspan="2"  >
                                  <p   class="lb lbCTPCount lbCTPCounta" value_ppwaerid="<%#Container.ItemIndex + 1%>">数量(张)</p>
                                </td>
                                     <td rowspan="2" >
                                        发版套数
                                    </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"   >
                                <td>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正</p>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背</p>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正面色数</p>
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背面色数</p>
                                </td>
                            </tr>
                            <tr>
@@ -221,10 +232,10 @@
                                   
                                </td>
                                <td colspan="2">
                                <td  >
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="2">
                                <td  >
                                    <select keepdefaultstyle="true" class="  w120px" name="PSF_PressesDesk"    value_selspec="<%#Container.ItemIndex + 1%>">
                                        <%--<option value="">请选择</option>--%>
                                        <%=PressesDeskHtml %>
@@ -251,7 +262,7 @@
                                        <option value="四+专">四+专</option>
                                    </select>
                                </td>
                                <td colspan="2">
                                <td>
                                    <select keepdefaultstyle="true" class="" name="PSF_Typesetting" value_ppwaerid="<%#Container.ItemIndex + 1%>">
                                        <option value="自翻">自翻</option>
                                        <option value="滚翻">滚翻</option>
@@ -265,7 +276,27 @@
                                      
                                    </select>
                                </td>
                                 <td>
                                      <div class="xialapp">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName lbCTPCount lbCTPCountb" name="CTPSpecName"   value="<%#Eval("PSF_CTPSpecType")%>" style=" width: 80px" />
                                          <div class="xialapbp" >
                                <%=xialapr %>
                            </div>
                        </div>
                                       </td>
                                 <td>
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
                               
                                       </td>
                                 <td>
                                      <select keepdefaultstyle="true" class="" name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>">
                                        <option value=""></option>
                                        <option value="2">2</option>
                                        <option value="3">3</option>
                                        <option value="4">4</option>
                                        <option value="5">5</option>
                                    </select>
                                       </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%" name="PSF_PrintedPaperTd"  value_selspec="<%#Container.ItemIndex + 1%>">
                                <td rowspan="2">
@@ -281,7 +312,7 @@
                                <p name="PSF_Zhizhangshuliang" value_selspecspan="<%#Container.ItemIndex + 1%>">纸张数量(张)</p>     
                                </td>
                                <td colspan="4">
                                  <p name="PSF_Kailiaoguige" value_selspecspan="<%#Container.ItemIndex + 1%>">开料规格</p>
                                  <p name="PSF_Kailiaoguige" value_selspecspan="<%#Container.ItemIndex + 1%>">开料规格(mm)</p>
                                </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"  name="PSF_PrintedPaperTdtr"  value_selspec="<%#Container.ItemIndex + 1%>">
@@ -298,10 +329,10 @@
                                <p name="PSF_OpenSpecificationsspan" value_selspecspan="<%#Container.ItemIndex + 1%>">开数</p>    
                                </td>
                                <td>
                                 <p name="PSF_Kuandu" value_selspecspan="<%#Container.ItemIndex + 1%>">宽度(mm)  </p>
                                 <p name="PSF_Kuandu" value_selspecspan="<%#Container.ItemIndex + 1%>">宽度</p>
                                </td>
                                <td>
                                   <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">长度(mm)</p>
                                   <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">长度</p>
                                </td>
                            </tr>
                            <tr name="PSF_PrintedPaperTdtrtr"  value_selspec="<%#Container.ItemIndex + 1%>">
@@ -359,16 +390,16 @@
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_OpenLength" value="<%#(Eval("PSF_OpenLength") == null || Eval("PSF_OpenLength").ToString()=="0")?"":Eval("PSF_OpenLength").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
                                </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%;display: none;">
                                <td style="display:none;">
                                    版材类型
                                </td>
                                <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                               <%-- <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                    规格
                                </td>
                                <td id="lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbCTPCount" colspan="3">
                                    CTP数量(张)
                                </td>
                                </td>--%>
                                <td id="lbPSSpec" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbPSSpec" colspan="2" style="display: none">
                                    PS版规格
                                </td>
@@ -378,7 +409,7 @@
                                <td colspan="7">
                                </td>
                            </tr>
                            <tr>
                            <tr style="display:none;">
                                <td style="display:none;">
                                    <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                        <option value="本厂CTP">本厂CTP</option>
@@ -389,17 +420,12 @@
                                    <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
                                        <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="连接仓库" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" />
                                </td>
                                <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                               <%-- <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                      <div class="xialapp" style="margin-left:32%;">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName " name="CTPSpecName" id="PlateSpec" value="<%#Eval("PSF_CTPSpecType")%>" />
                                          <div class="xialapbp" >
                                <%=xialapr %>
                              <%--  <div class="xialapr">500</div>
                                <div class="xialapr">1000</div>
                                <div class="xialapr">2000</div>
                                <div class="xialapr">3000</div>
                                <div class="xialapr">5000</div>
                                <div class="xialapr">10000</div>--%>
                            </div>
                        </div>
                                    <select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="sel selCTPSpec" name="selCTPSpec" style="display: none; width: 80px" id="selCTPSpec">
@@ -413,7 +439,7 @@
                                </td>
                                <td id="tdCTPCount" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdCTPCount" colspan="3">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount" id="CTPCount" value="<%#Eval("PSF_CTPCount")%>" />
                                </td>
                                </td>--%>
                                <td id="tdPSSpec" style="display: none" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdPSSpec" colspan="2">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt PSF_PSBan" name="PSF_PSBan" style="width: 80px;" id="PSF_PSBan" value="<%#Eval("PSF_PSSpec")%>" />
                                    <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
@@ -433,9 +459,9 @@
                                   <input type="text"   name="PSF_Qitadingdanhao"  style="width: 50%;"   value_ppwaerid="<%#Container.ItemIndex + 1%>"value="<%#Eval("PSF_PaperName")%>" maxlength="50" /> 
                                </td>
                            </tr>
                            <tr>
                            <tr style=" display:none;">
                                <td style="font-weight: bold; background-color: #E6E6E6;">
                                    注意事项:
                                    生产要求:
                                </td>
                                <td colspan="12">
                                    <textarea style="width: 96%; height: 40px; float: left;" name="PSF_Note"><%#Eval("PSF_Note")%></textarea>
@@ -454,8 +480,56 @@
            </td>
        </tr>
            <tr>
            <td colspan="2">
                <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                    <tbody>
                        <tr>
                <td class="ali03 w70px " >
                备注:
                后道工序:
                 </td>
                            <td>
                                 <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                                     <tbody>
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                         <tr class="AddHoudao" value_id="<%#Container.ItemIndex + 1%>" >
                                             <td>
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu" >
                            <%#Eval("PSF_Houdaogongxu")%>
                        </select>
                    </td>
                                              <td>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>"/>
                    </td>
                                             <td>
                        倍数:<input type="text" name="txtBeishu" class=" w40px int" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>"/>
                    </td>
       <td>
                        机长:<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>
                    </td>
                                              <td>
                       要求: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
                    </td>
                                              </tr>
                          </ItemTemplate>
                </asp:Repeater>
                                         </tbody>
                                     </table>
                            </td>
                             <td class="w70px " >
                                 <a class="Btn AddHoudaos"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
                 </td>
                        </tr>
                    </tbody>
                </table>
            </td>
        </tr>
            <tr>
                <td class="ali03 w70px " >
                生产要求:
                 </td>
                <td colspan="9">
                    <textarea style="width: 940px; height: 62px;" name="PMS_Remarks" runat = "server" id="PMS_Remarks"></textarea>
@@ -560,6 +634,7 @@
                 $("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
                 $("select[name='PSF_PrintedColorPositive']").last().attr("value_selspec", value_id + 1);
                 $("select[name='PSF_Typesetting']").last().attr("value_ppwaerid", value_id + 1);
                 $("select[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
                 $("input[name='PSF_OpenWidth']").last().attr("value_ppwaerid", value_id + 1);
                 $("input[name='PSF_OpenWidthName']").last().attr("value_ppwaerid", value_id + 1);
                 $("input[name='PSF_OpenLength']").last().attr("value_ppwaerid", value_id + 1);
@@ -569,6 +644,9 @@
                 $(".CTPSpecName").last().attr("value_ppwaerid", value_id + 1);
                 $(".CTPCount").last().attr("value_ppwaerid", value_id + 1);
                 $(".lbCTPCount").last().attr("value_ppwaerid", value_id + 1);
                 $(".lbCTPCounta").last().attr("value_ppwaerid", value_id + 1);
                 $(".lbCTPCountb").last().attr("value_ppwaerid", value_id + 1);
                 $(".lbCTPCountc").last().attr("value_ppwaerid", value_id + 1);
                 $(".PSF_Qitadingdanhao").last().attr("value_ppwaerid", value_id + 1);
                 $("input[name='PSF_Qitadingdanhao']").last().attr("value_ppwaerid", value_id + 1);
                 $("select[name='PSF_Component']").last().attr("value_ppwaerid", value_id + 1);
@@ -650,6 +728,24 @@
                if (value_id == 1) {
                } else {
                    $(".AddTab").last().remove();
                }
            });
             $(".AddHoudaos").click(function () {
                 var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                 $(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
                 $(".AddHoudao").last().attr("value_id", value_id + 1);
             });
             $(".CutHoudaos").click(function () {
                 var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                 if (value_id == 1) {
                 } else {
                     $(".AddHoudao").last().remove();
                }
            });
@@ -1168,61 +1264,7 @@
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
                    if ($("#spanOrderPrintDemand").html() != "" && $("#spanOrderPrintDemand").html().indexOf("table") < 0) {
                        var sss = $("#spanOrderPrintDemand").html().split(';');
                        if (sss != null) {
                            for (var i = 0; i < sss.length; i++) {
                                var sfdsdfdf = sss[i].split(',');
                                if (sfdsdfdf[0].indexOf('(') >= 0 && sfdsdfdf[0].indexOf(')') >= 0) {
                                    // 假设要截取的字符串为str,开始字符串为start,结束字符串为end
                                    var startIndex = sfdsdfdf[0].indexOf('(') + 1;
                                    var endIndex = sfdsdfdf[0].indexOf(')');
                                    var substr = sfdsdfdf[0].slice(startIndex, endIndex);
                                    var ssssaaa = substr;
                                    if (ssssaaa.indexOf('×') >= 0) {
                                        var dfdfdf = ssssaaa.split('×');
                                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", "").trim());
                                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", "").trim());
                                    } else if (ssssaaa.indexOf('*') >= 0) {
                                        var dfdfdf = ssssaaa.split('*');
                                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", "").trim());
                                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", "").trim());
                                    }
                                } else {
                                    if (sss[i].indexOf('×') >= 0) {
                                        var sfdsdfdf = sss[i].split(',');
                                        var dfdfdf = sfdsdfdf[0].split('×');
                                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", "").trim());
                                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", "").trim());
                                    } else if (sss[i].indexOf('*') >= 0) {
                                        var sfdsdfdf = sss[i].split(',');
                                        var dfdfdf = sfdsdfdf[0].split('*');
                                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", "").trim());
                                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", "").trim());
                                    }
                                }
                            }
                        }
                    }
                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
@@ -1404,6 +1446,7 @@
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorRear']").val($(vv).attr("value_hide_psf_printedcolorrear"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesetting']").val($(vv).attr("value_hide_psf_typesetting"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesettinghide']").val($(vv).attr("value_hide_psf_typesetting"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PaperSource']").val($(vv).attr("value_hide_psf_papersource"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_OpenSpecifications']").val($(vv).attr("value_hide_psf_openspecifications"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='selPaperName']").val($(vv).attr("value_hide_psf_selPaperName"));
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -13,6 +13,7 @@
using CY.BLL.OA;
using CY.Infrastructure.Query;
using CY.WebForm.Pages.common;
using CY.BLL.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -27,7 +28,7 @@
        OA_InventoryBLL bll_OA_InventoryBLL = null;
        OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
        public Guid targetid = Guid.Empty;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
 
 
 
@@ -45,7 +46,7 @@
        public string[] Lenth = new string[7];
        public string xialapr = "";
        AfterParameterInfoBLL _afterParameterInfoBLL = null;
        //初始化
        public AgMergerOrderEdit()
        {
@@ -57,6 +58,8 @@
            bll_OA_InventoryBLL = new OA_InventoryBLL();
            bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
            _afterParameterInfoBLL = new AfterParameterInfoBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
        }
        //页面加载
@@ -204,7 +207,6 @@
                }
                else
                {
                    EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
                    EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(item.ToInt32().Value);
                    InquiryCommonModel _inquiryCommonModel = null;
                    if (null == _eC_OrderPrintParameter)
@@ -304,6 +306,120 @@
            }
            this.Repeater1.DataSource = m_EC_MergerForumsList;
            this.Repeater1.DataBind();
            List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
            if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count == 0)
            {
                m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
                EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
                m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
            }
            List<int> houdaolist = new List<int>();
            List<string> houdaostringlist = new List<string>();
            foreach (var eC_OrderBasic in mEC_OrderBasicList)
            {
                EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(eC_OrderBasic.Keyid.ToInt32().Value);
                InquiryCommonModel _inquiryCommonModel = null;
                if (null == _eC_OrderPrintParameter)
                {
                    _inquiryCommonModel = new InquiryCommonModel();
                }
                else
                {
                    _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                }
                var ssssss = _inquiryCommonModel.AfterWorkList;
                var inquiryInsideModels = _inquiryCommonModel.InquiryInsideList;
                if (ssssss != null && ssssss.Count > 0)
                {
                    foreach (var aaaaa in ssssss)
                    {
                        houdaolist.Add(aaaaa);
                    }
                }
                if (inquiryInsideModels != null && inquiryInsideModels.Count > 0)
                {
                    foreach (var inquiryInsideModel in inquiryInsideModels)
                    {
                        var afterWorkList = inquiryInsideModel.AfterWorkList;
                        if (afterWorkList != null && afterWorkList.Count > 0)
                        {
                            foreach (var aaaaa in afterWorkList)
                            {
                                houdaolist.Add(aaaaa);
                            }
                        }
                    }
                }
                if (eC_OrderBasic.PrintTypeId == 29 || eC_OrderBasic.PrintTypeId == 27)
                {
                    if(houdaostringlist.Count(x=>x == _inquiryCommonModel.JTWZ) <= 0)
                    {
                        houdaostringlist.Add(_inquiryCommonModel.JTWZ);
                    }
                    if(eC_OrderBasic.PrintTypeId == 27)
                    {
                        houdaolist = new List<int>();
                    }
                }
            }
            foreach (var c_MergerHoudaos in m_EC_MergerHoudaosList)
            {
                string select = "<option value=''>无</option>";
                var sysInquiry_Afters = _afterParameterInfoBLL.GetModelList().Where(x => houdaolist.Contains(x.KeyId)).ToList();
                if (sysInquiry_Afters != null && sysInquiry_Afters.Count > 0)
                {
                    foreach (var item in sysInquiry_Afters)
                    {
                        if (item.ParameterName == c_MergerHoudaos.PSF_Houdaogongxu)
                        {
                            select += "<option value='" + item.ParameterName + "'  selected=\"selected\" >" + item.ParameterName + "</option>";
                        }
                        else
                        {
                            select += "<option value='" + item.ParameterName + "'>" + item.ParameterName + "</option>";
                        }
                    }
                }
                foreach(var str in houdaostringlist)
                {
                    if (sysInquiry_Afters.Count(x => x.ParameterName == str) <= 0)
                    {
                        if (str == c_MergerHoudaos.PSF_Houdaogongxu)
                        {
                            select += "<option value='" + str + "' selected=\"selected\" >" + str + "</option>";
                        }
                        else
                        {
                            select += "<option value='" + str + "' >" + str + "</option>";
                        }
                    }
                }
                c_MergerHoudaos.PSF_Houdaogongxu = select;
            }
            this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
            this.RepeaterHoudaoList.DataBind();
            //获取开料尺寸
            EC_CuttingPaperSpec model = new EC_CuttingPaperSpec();
@@ -419,6 +535,7 @@
                string[] PSF_PrintedColorRear = Request["PSF_PrintedColorRear"].ToString2().Split(',');
                string[] PSF_Typesetting = Request["PSF_Typesetting"].ToString2().Split(',');
                string[] PSF_Typesettinghide = Request["PSF_Typesettinghide"].ToString2().Split(',');
                string[] PSF_Fabantaoshu = Request["PSF_Fabantaoshu"].ToString2().Split(',');
                string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
                string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
                string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
@@ -454,6 +571,13 @@
                string[] oldPSF_PaperId = Request["oldPSF_PaperId"].ToString2().Split(',');
                string[] oldPSF_BigPaperCount = Request["oldPSF_BigPaperCount"].ToString2().Split(',');
                string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
                string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
                string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
                string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
                string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');
                int? keyid = Request["keyid"].ToInt32();
@@ -682,6 +806,7 @@
                List<EC_MergerForums> m_EC_MergerForumsList = new List<EC_MergerForums>();
                List<OA_Inventory> m_OA_InventoryList = new List<OA_Inventory>();
                List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
                List<EC_MergerHoudaos> m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
                for (int i = 0; i < PSF_Forumsid.Length; i++)
                {
@@ -706,7 +831,7 @@
                    {
                        m_EC_MergerForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace(",+-+,", ",");
                    }
                    m_EC_MergerForums.PSF_Fabantaoshu = PSF_Fabantaoshu[i];
                    if (PSF_PrintedCount[i].ToInt32() == null)
                    {
@@ -821,6 +946,16 @@
                        m_EC_MergerForums.PSF_CTPSpecType = selFilmSpec[i].ToString2().Replace(",+-+,", ",");
                        m_EC_MergerForums.PSF_CTPCount = 0;
                    }
                    m_EC_MergerForums.PSF_CTPSpecType = CTPSpecName[i].ToString2().Replace(",+-+,", ",");
                    if (CTPCount[i].ToInt32() == null)
                    {
                        m_EC_MergerForums.PSF_CTPCount = 0;
                    }
                    else
                    {
                        m_EC_MergerForums.PSF_CTPCount = CTPCount[i].ToInt32();
                    }
                    m_EC_MergerForums.PSF_FilmType = "";
                    m_EC_MergerForums.PSF_PSSpec = PSF_PSBan[i].ToString2().Replace(",+-+,", ",");
                    if (PSCount[i].ToInt32() == null)
@@ -924,10 +1059,28 @@
                }
                
                for (int i = 0; i < selHoudaogongxu.Length; i++)
                {
                    EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
                    m_EC_MergerHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace(",+-+,", ",");
                    m_EC_MergerHoudaos.PSF_Shuliang = txtShuliang[i];
                    m_EC_MergerHoudaos.PSF_Beishu = txtBeishu[i];
                    m_EC_MergerHoudaos.PSF_Jichang = txtJichang[i];
                    m_EC_MergerHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
                    if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Shuliang)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Beishu)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Jichang)
                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Yaoqiu))
                    {
                        m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
                    }
                }
                if (m_EC_MergerSingle.Keyid != null)
                {
                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList))
                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_MergerHoudaosList))
                    {
                        JavaScript.MessageBox("修改成功", this, true, true);
                    }
@@ -975,7 +1128,7 @@
                        orderId = null;
                    }
                    if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList))
                    if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList, m_EC_MergerHoudaosList))
                    {
                        //JavaScript.MessageBox("操作成功", this, true, true);
                        //btn_submit.Enabled = false;
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
@@ -96,6 +96,15 @@
        protected global::System.Web.UI.WebControls.Repeater Repeater1;
        /// <summary>
        /// RepeaterHoudaoList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepeaterHoudaoList;
        /// <summary>
        /// PMS_Remarks 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -237,35 +237,47 @@
                                    <td rowspan="2">
                                         <%=PrintTypeId=="7"?"成品尺寸":"构件"  %>   
                                    </td>
                                    <td rowspan="2" colspan="2">
                                        <%=PrintTypeId=="7"?"版数":"P数"  %>
                                    <td rowspan="2">
                                        <%=PrintTypeId=="7"?"版数":"页数"  %>
                                    </td>
                                    <td rowspan="2" colspan="2">
                                    <td rowspan="2">
                                        印刷机台
                                    </td>
                                    <td colspan="2">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印色</span>
                                    <td colspan="3">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印刷要求</span>
                                    </td>
                                    <td rowspan="2" colspan="2">
                                   <%-- <td rowspan="2" colspan="2">
                                       <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>    
                                    </td>--%>
                                     <td rowspan="2" >
                                     <span  style="<%#Eval("shifouxianshi")%>" >  板材规格</span>
                                    </td>
                                     <td rowspan="2" >
                                     <span  style="<%#Eval("shifouxianshi")%>" > 数量(张) </span>
                                    </td>
                                     <td rowspan="2" >
                                        发版套数
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >正</span>
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背</span>
                                        <span  style="<%#Eval("shifouxianshi")%>" >正面色数</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背面色数</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;">
                                    <td>
                                        <%#Eval("PSF_Component")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#Eval("PSF_PressesDesk")%>
                                    </td>
                                    <td>
@@ -274,7 +286,7 @@
                                    <td>
                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
                                    </td>
                                    <td colspan="2">
                                    <td >
                                     <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>       
                                    </td>
                                    <%--<td>
@@ -286,6 +298,15 @@
                                    <td>
                                        <%#Eval("PSF_EditionCount")%>
                                    </td>--%>
                                   <td>
                                         <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >   <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
                                    </td>
                                    <td>
                                        <%#Eval("PSF_Fabantaoshu")%>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>" >
                                    <td rowspan="2">
@@ -301,7 +322,7 @@
                                      <span  style="<%#Eval("shifouxianshilunzhuan")%>" >纸张数量(张)</span>       
                                    </td>
                                    <td colspan="4">
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格</span>
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格(mm)</span>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
@@ -318,10 +339,10 @@
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开数</span>      
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度(mm)</span>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度</span>
                                    </td>
                                    <td>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度(mm)</span>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
@@ -356,7 +377,7 @@
                                        <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                              <%--  <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >版材类型</span>
                                    </td>
@@ -374,7 +395,7 @@
                                    </td>
                                    <td colspan="6">
                                    </td>
                                    <tr>
                                    </tr>
                                        <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
                                            <td>
                                               <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
@@ -393,7 +414,7 @@
                                            </td>
                                            <td colspan="6">
                                            </td>
                                        </tr>
                                        </tr>--%>
                                        <tr style="<%#Eval("shifouqitadingdan")%>">
                                            <td style="font-weight: bold; background-color: #E6E6E6;">
                                                其它订单的订单号:
@@ -402,9 +423,9 @@
                                                <%#Eval("PSF_PaperName")%>
                                            </td>
                                        </tr>
                                        <tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
                                        <tr style=" display:none;">
                                            <td style="font-weight: bold; background-color: #E6E6E6;">
                                                注意事项:
                                                生产要求:
                                            </td>
                                            <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
                                                <%#Eval("PSF_Note")%>
@@ -415,16 +436,67 @@
                    </asp:Repeater>
                </td>
            </tr>
             <tr id="Tr1" runat="server">
                <td colspan="2" style=" border:0px solid red;">
                    <table cellpadding="0" cellspacing="0" style="text-align: left;width: 100%;">
                        <tbody>
                            <tr>
                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;" rowspan="<%=therowspan %>">
                                                后道工序:
                                            </td>
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                             <td>
                            <%#Eval("PSF_Houdaogongxu")%>
                    </td>
                                              <td>
                        数量: <%#Eval("PSF_Shuliang")%>
                    </td>
                                             <td>
                        倍数: <%#Eval("PSF_Beishu")%>
                    </td>
       <td>
                        机长:<%#Eval("PSF_Jichang")%>
                    </td>
                                              <td>
                       要求: <%#Eval("PSF_Yaoqiu")%>
                    </td>
                          </tr>
                          </ItemTemplate>
                </asp:Repeater>
                        </tbody>
                    </table>
                </td>
            </tr>
            <tr id="txtPSO_Work_o_TR" runat="server">
                <td colspan="2" style=" border:0px solid red;">
                    <table cellpadding="0" cellspacing="0" style="text-align: left;">
                        <tr style="border: none; background-color: #E4E4E4;">
                       <%-- <tr style="border: none; background-color: #E4E4E4;">
                            <th colspan="1" style="text-align: left; text-indent: 5px;">
                                <b>后道工序</b>
                            </th>
                        </tr>
                        </tr>--%>
                        <tbody>
                            <tr>
                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                                                后道工序:
                                            </td>
                                <td>
                                    <span runat="server" id="txtPSO_Work_o"></span>
                                </td>
@@ -436,13 +508,17 @@
            <tr id="txtPSO_Remarks_o_TR" runat="server">
                <td colspan="2" style=" border:0px solid red;">
                    <table cellpadding="0" cellspacing="0" style="text-align: left;">
                        <tr style="border: none; background-color: #E4E4E4;">
                        <%--<tr style="border: none; background-color: #E4E4E4;">
                            <th colspan="1" style="text-align: left; text-indent: 5px;">
                                <b>备注</b>
                            </th>
                        </tr>
                        </tr>--%>
                        <tbody>
                            <tr>
                                  <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                                                生产要求:
                                            </td>
                                <td>
                                    <span runat="server" id="txtPSO_Remarks_o"></span>
                                </td>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -21,6 +21,7 @@
        EC_SpecialOrdersBLL bll_EC_SpecialOrdersBLL = null;
        string orderIdStr = string.Empty;
        public string PrintTypeId = "";
        public string therowspan = "";
        //初始化
        public AgSpecialOrderDetail()
        {
@@ -121,7 +122,7 @@
            {
                this.txtPSO_Work_o.InnerText = m_EC_SpecialOrders.PSO_Work;
            }
            this.txtPSO_Work_o_TR.Visible = false;
            if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Remarks))
            {
                this.txtPSO_Remarks_o_TR.Visible = false;
@@ -204,6 +205,26 @@
            }
            this.RepClientList.DataSource = m_EC_SpecialForumsList;
            this.RepClientList.DataBind();
            List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList = bll_EC_SpecialOrdersBLL.GetEC_SpecialHoudaosListByKeyid(m_EC_SpecialOrders.Keyid) as List<EC_SpecialHoudaos>;
            this.RepeaterHoudaoList.DataSource = m_EC_SpecialHoudaosList;
            this.RepeaterHoudaoList.DataBind();
            if (m_EC_SpecialHoudaosList == null || m_EC_SpecialHoudaosList.Count <= 0)
            {
                this.Tr1.Visible = false;
            }
            if(m_EC_SpecialHoudaosList != null)
            {
                therowspan = (m_EC_SpecialHoudaosList.Count + 1) + "";
            }
            else
            {
                therowspan =  "1";
            }
            return true;
        }
        /// <summary>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
@@ -240,6 +240,24 @@
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// Tr1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTableRow Tr1;
        /// <summary>
        /// RepeaterHoudaoList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepeaterHoudaoList;
        /// <summary>
        /// txtPSO_Work_o_TR 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -197,7 +197,7 @@
                            <thead>
                                <tr class="ForumName" style="display:none">
                                    <th colspan="12">
                                        <b>第<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>版<input name="PSF_Forumsid" value="<%#Container.ItemIndex + 1%>" type="hidden" value_hide_psf_component="<%#Eval("PSF_Component")%>" value_hide_psf_pressesdesk="<%#Eval("PSF_PressesDesk")%>" value_hide_psf_printedcolorpositive="<%#Eval("PSF_PrintedColorPositive")%>" value_hide_psf_printedcolorrear="<%#Eval("PSF_PrintedColorRear")%>" value_hide_psf_typesetting="<%#Eval("PSF_Typesetting")%>" value_hide_psf_papersource="<%#Eval("PSF_PaperSource")%>" value_hide_psf_openspecifications="<%#Eval("PSF_OpenSpecifications")%>" value_hide_psf_selpapername="<%#Eval("PSF_PaperName")%>" value_hide_psf_selpaperspec="<%#Eval("PSF_MaterialSpecifications")%>" value_hide_psf_selplatetype="<%#Eval("PSF_PlateSource")%>" value_hide_psf_selctpspec="<%#Eval("PSF_CTPSpecType")%>" value_hide_psf_selfilmspec="<%#Eval("PSF_FilmType")%>" /></b>
                                        <b>第<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>版<input name="PSF_Forumsid" value="<%#Container.ItemIndex + 1%>" type="hidden" value_hide_psf_component="<%#Eval("PSF_Component")%>" value_hide_psf_pressesdesk="<%#Eval("PSF_PressesDesk")%>" value_hide_psf_printedcolorpositive="<%#Eval("PSF_PrintedColorPositive")%>" value_hide_psf_printedcolorrear="<%#Eval("PSF_PrintedColorRear")%>" value_hide_psf_typesetting="<%#Eval("PSF_Typesetting")%>" value_hide_psf_fabantaoshu="<%#Eval("PSF_Fabantaoshu")%>"  value_hide_psf_papersource="<%#Eval("PSF_PaperSource")%>" value_hide_psf_openspecifications="<%#Eval("PSF_OpenSpecifications")%>" value_hide_psf_selpapername="<%#Eval("PSF_PaperName")%>" value_hide_psf_selpaperspec="<%#Eval("PSF_MaterialSpecifications")%>" value_hide_psf_selplatetype="<%#Eval("PSF_PlateSource")%>" value_hide_psf_selctpspec="<%#Eval("PSF_CTPSpecType")%>" value_hide_psf_selfilmspec="<%#Eval("PSF_FilmType")%>" /></b>
                                    </th>
                                </tr>
                            </thead>
@@ -205,26 +205,38 @@
                                <td rowspan="2" style="width: 195px;">
                                 <%=PrintTypeId=="7"?"成品尺寸":"构件"  %>   
                                </td>
                                <td rowspan="2" colspan="2" >
                                   <%=PrintTypeId=="7"?"版数":"P数"  %>
                                <td rowspan="2"  >
                                   <%=PrintTypeId=="7"?"版数":"页数"  %>
                                </td>
                                <td rowspan="2" colspan="2">
                                <td rowspan="2"  >
                                    印刷机台
                                </td>
                                <td colspan="2"   >
                                    <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">印色</p>
                                <td colspan="3"   >
                                    <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷要求</p>
                                </td>
                                <td rowspan="2" colspan="2">
                              <%--  <td rowspan="2" colspan="2">
                                    <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>      
                                </td>--%>
                                 <td rowspan="2"   >
                                    <p   class="lb lbCTPCount lbCTPCountc" value_ppwaerid="<%#Container.ItemIndex + 1%>">板材规格</p>
                                </td>
                                <td  rowspan="2"  >
                                  <p   class="lb lbCTPCount lbCTPCounta" value_ppwaerid="<%#Container.ItemIndex + 1%>">数量(张)</p>
                                </td>
                                     <td rowspan="2" >
                                        发版套数
                                </td>
                                 
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"   >
                                <td>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正</p>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背</p>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正面色数</p>
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背面色数</p>
                                </td>
                            </tr>
                            <tr>
@@ -239,10 +251,10 @@
                                    <input type="text" class="  w120px " maxlength="50"   name="PSF_Chengpinchicun"  value_ppwaerid="<%#Container.ItemIndex + 1%>" value="<%#Eval("PSF_Component")%>" <%=PrintTypeId=="7"?"":"style=\"display:none;\""  %>  />
                                </td>
                                <td colspan="2">
                                <td  >
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="2">
                                <td  >
                                    <select keepdefaultstyle="true" class="  w120px" name="PSF_PressesDesk"    value_selspec="<%#Container.ItemIndex + 1%>">
                                        <%--<option value="">请选择</option>--%>
                                        <%=PressesDeskHtml %>
@@ -269,7 +281,7 @@
                                        <option value="四+专">四+专</option>
                                    </select>
                                </td>
                                <td colspan="2">
                                <td>
                                    <select keepdefaultstyle="true" class="" name="PSF_Typesetting" value_ppwaerid="<%#Container.ItemIndex + 1%>">
                                        <option value="自翻">自翻</option>
                                        <option value="滚翻">滚翻</option>
@@ -281,6 +293,27 @@
                                         <option value="单面">单面</option>
                                           <option value="双面">双面</option>
                                      
                                    </select>
                                </td>
                                 <td>
                                      <div class="xialapp" >
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName lbCTPCount lbCTPCountb" name="CTPSpecName" value="<%#Eval("PSF_CTPSpecType")%>" style=" width: 80px" />
                                          <div class="xialapbp" >
                                <%=xialapr %>
                            </div>
                        </div>
                                       </td>
                                 <td>
                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
                                       </td>
                                 <td>
                                      <select keepdefaultstyle="true" class="" name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>">
                                        <option value=""></option>
                                        <option value="2">2</option>
                                        <option value="3">3</option>
                                        <option value="4">4</option>
                                        <option value="5">5</option>
                                    </select>
                                </td>
                               
@@ -299,7 +332,7 @@
                                <p name="PSF_Zhizhangshuliang" value_selspecspan="<%#Container.ItemIndex + 1%>">纸张数量(张)</p>     
                                </td>
                                <td colspan="4">
                                  <p name="PSF_Kailiaoguige" value_selspecspan="<%#Container.ItemIndex + 1%>">开料规格</p>
                                  <p name="PSF_Kailiaoguige" value_selspecspan="<%#Container.ItemIndex + 1%>">开料规格(mm) </p>
                                </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"  name="PSF_PrintedPaperTdtr"  value_selspec="<%#Container.ItemIndex + 1%>">
@@ -316,10 +349,10 @@
                                <p name="PSF_OpenSpecificationsspan" value_selspecspan="<%#Container.ItemIndex + 1%>">开数</p>    
                                </td>
                                <td>
                                 <p name="PSF_Kuandu" value_selspecspan="<%#Container.ItemIndex + 1%>">宽度(mm)  </p>
                                 <p name="PSF_Kuandu" value_selspecspan="<%#Container.ItemIndex + 1%>">宽度</p>
                                </td>
                                <td>
                                   <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">长度(mm)</p>
                                   <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">长度</p>
                                </td>
                            </tr>
                            <tr name="PSF_PrintedPaperTdtrtr"  value_selspec="<%#Container.ItemIndex + 1%>">
@@ -377,16 +410,16 @@
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_OpenLength" value="<%#(Eval("PSF_OpenLength") == null || Eval("PSF_OpenLength").ToString()=="0")?"":Eval("PSF_OpenLength").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
                                </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%;display: none;">
                                <td style="display:none;">
                                    版材类型
                                </td>
                                <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                <%--<td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                    规格
                                </td>
                                <td id="lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbCTPCount" colspan="3">
                                    CTP数量(张)
                                </td>
                                </td>--%>
                                <td id="lbPSSpec" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbPSSpec" colspan="2" style="display: none">
                                    PS版规格
                                </td>
@@ -396,7 +429,7 @@
                                <td colspan="7">
                                </td>
                            </tr>
                            <tr>
                            <tr style="display:none;">
                                <td style="display:none;">
                                    <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                        <option value="本厂CTP">本厂CTP</option>
@@ -407,17 +440,12 @@
                                    <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
                                        <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="连接仓库" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" />
                                </td>
                                <td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                <%--<td colspan="2"  class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' >
                                      <div class="xialapp" style="margin-left:32%;">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName " name="CTPSpecName" id="PlateSpec" value="<%#Eval("PSF_CTPSpecType")%>" />
                                          <div class="xialapbp" >
                                <%=xialapr %>
                              <%--  <div class="xialapr">500</div>
                                <div class="xialapr">1000</div>
                                <div class="xialapr">2000</div>
                                <div class="xialapr">3000</div>
                                <div class="xialapr">5000</div>
                                <div class="xialapr">10000</div>--%>
                            </div>
                        </div>
                                    <select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="sel selCTPSpec" name="selCTPSpec" style="display: none; width: 80px" id="selCTPSpec">
@@ -431,7 +459,7 @@
                                </td>
                                <td id="tdCTPCount" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdCTPCount" colspan="3">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount" id="CTPCount" value="<%#Eval("PSF_CTPCount")%>" />
                                </td>
                                </td>--%>
                                <td id="tdPSSpec" style="display: none" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdPSSpec" colspan="2">
                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt PSF_PSBan" name="PSF_PSBan" style="width: 80px;" id="PSF_PSBan" value="<%#Eval("PSF_PSSpec")%>" />
                                    <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
@@ -451,9 +479,9 @@
                                   <input type="text"   name="PSF_Qitadingdanhao"  style="width: 50%;"   value_ppwaerid="<%#Container.ItemIndex + 1%>"value="<%#Eval("PSF_PaperName")%>" maxlength="50" /> 
                                </td>
                            </tr>
                            <tr>
                            <tr style=" display:none;">
                                <td style="font-weight: bold; background-color: #E6E6E6;">
                                    注意事项:
                                    生产要求:
                                </td>
                                <td colspan="12">
                                    <textarea style="width: 96%; height: 40px; float: left;" name="PSF_Note"><%#Eval("PSF_Note")%></textarea>
@@ -474,15 +502,67 @@
        <tr>
            <td colspan="2">
                <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                    <thead>
                    <tbody>
                        <tr>
                             <td class="ali03 w70px " >
                后道工序:
                 </td>
                            <td>
                                 <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                                     <tbody>
                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
                    <ItemTemplate>
                                         <tr class="AddHoudao" value_id="<%#Container.ItemIndex + 1%>" >
                                             <td>
                        <select keepdefaultstyle="true"   class=" w70px" name="selHoudaogongxu" >
                            <%#Eval("PSF_Houdaogongxu")%>
                        </select>
                    </td>
                                              <td>
                        数量:<input type="text" name="txtShuliang" class=" w40px int" min="0" maxlength="50" value="<%#Eval("PSF_Shuliang")%>"/>
                    </td>
                                             <td>
                        倍数:<input type="text" name="txtBeishu" class=" w40px int" min="0" maxlength="50"  value="<%#Eval("PSF_Beishu")%>"/>
                    </td>
       <td>
                        机长:<input type="text" name="txtJichang" class=" w80px"  maxlength="50" value="<%#Eval("PSF_Jichang")%>"/>
                    </td>
                                              <td>
                       要求: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
                    </td>
                                              </tr>
                          </ItemTemplate>
                </asp:Repeater>
                                         </tbody>
                                     </table>
                            </td>
                             <td class="w70px " >
                                 <a class="Btn AddHoudaos"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
                 </td>
                        </tr>
                    </tbody>
                </table>
            </td>
        </tr>
        <tr  style="display:none;">
            <td colspan="2">
                <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                    <%--<thead>
                        <tr>
                            <th>
                                <b>后道工序</b>
                            </th>
                        </tr>
                    </thead>
                    </thead>--%>
                    <tbody>
                        <tr>
                             <td class="ali03 w70px " >
                后道工序:
                 </td>
                            <td>
                                <textarea style="width: 96%; height: 40px;" name="PSO_Work" runat="server" id="txtPSO_Work"></textarea>
                            </td>
@@ -494,15 +574,18 @@
        <tr>
            <td colspan="2">
                <table class="tableStyle" style="width: 98%; margin: 5px auto;">
                    <thead>
                   <%-- <thead>
                        <tr>
                            <th>
                                <b>备注</b>
                            </th>
                        </tr>
                    </thead>
                    </thead>--%>
                    <tbody>
                        <tr>
                            <td class="ali03 w70px " >
                生产要求:
                 </td>
                            <td>
                                <textarea style="width: 96%; height: 40px;" name="PSO_Remarks" runat="server" id="txtPSO_Remarks"></textarea>
                            </td>
@@ -606,6 +689,7 @@
                $("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
                $("select[name='PSF_PrintedColorPositive']").last().attr("value_selspec", value_id + 1);
                $("select[name='PSF_Typesetting']").last().attr("value_ppwaerid", value_id + 1);
                $("select[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
                $("input[name='PSF_OpenWidth']").last().attr("value_ppwaerid", value_id + 1);
                $("input[name='PSF_OpenWidthName']").last().attr("value_ppwaerid", value_id + 1);
                $("input[name='PSF_OpenLength']").last().attr("value_ppwaerid", value_id + 1);
@@ -615,6 +699,9 @@
                $(".CTPSpecName").last().attr("value_ppwaerid", value_id + 1);
                $(".CTPCount").last().attr("value_ppwaerid", value_id + 1);
                $(".lbCTPCount").last().attr("value_ppwaerid", value_id + 1);
                $(".lbCTPCounta").last().attr("value_ppwaerid", value_id + 1);
                $(".lbCTPCountb").last().attr("value_ppwaerid", value_id + 1);
                $(".lbCTPCountc").last().attr("value_ppwaerid", value_id + 1);
                $(".PSF_Qitadingdanhao").last().attr("value_ppwaerid", value_id + 1);
                $("input[name='PSF_Qitadingdanhao']").last().attr("value_ppwaerid", value_id + 1);
                $("select[name='PSF_Component']").last().attr("value_ppwaerid", value_id + 1);
@@ -715,6 +802,26 @@
                    $(".AddTab").last().remove();
                }
            });
            $(".AddHoudaos").click(function () {
                var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                $(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
                $(".AddHoudao").last().attr("value_id", value_id + 1);
            });
            $(".CutHoudaos").click(function () {
                var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                if (value_id == 1) {
                } else {
                    $(".AddHoudao").last().remove();
                }
            });
            $("select[name='PSF_PaperSource']").live("change", function () {
                var value_SelWaerId = $(this).attr("value_SelWaerId");
@@ -1472,6 +1579,7 @@
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorRear']").val($(vv).attr("value_hide_psf_printedcolorrear"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesetting']").val($(vv).attr("value_hide_psf_typesetting"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesettinghide']").val($(vv).attr("value_hide_psf_typesetting"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PaperSource']").val($(vv).attr("value_hide_psf_papersource"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_OpenSpecifications']").val($(vv).attr("value_hide_psf_openspecifications"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='selPaperName']").val($(vv).attr("value_hide_psf_selPaperName"));
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -13,6 +13,7 @@
using CY.Model.Inquiry;
using CY.BLL.OA;
using CY.SQLDAL;
using CY.BLL.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -46,7 +47,7 @@
        public string shukuanhuaceneiye4 = "";
        public string shukuanhuaceneiye5 = "";
        public string PrintTypeId = "";
        AfterParameterInfoBLL _afterParameterInfoBLL = null;
        //初始化
        public AgSpecialOrderEdit()
        {
@@ -55,6 +56,7 @@
            bll_OA_InventoryBLL = new OA_InventoryBLL();
            bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
            _afterParameterInfoBLL = new AfterParameterInfoBLL();
        }
        //页面加载
@@ -314,6 +316,84 @@
            this.RepClientList.DataSource = m_EC_SpecialForumsList;
            this.RepClientList.DataBind();
            List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList = bll_EC_SpecialOrdersBLL.GetEC_SpecialHoudaosListByKeyid(m_EC_SpecialOrders.Keyid) as List<EC_SpecialHoudaos>;
            if (m_EC_SpecialHoudaosList == null || m_EC_SpecialHoudaosList.Count == 0)
            {
                m_EC_SpecialHoudaosList = new List<EC_SpecialHoudaos>();
                EC_SpecialHoudaos m_EC_SpecialHoudaos = new EC_SpecialHoudaos();
                m_EC_SpecialHoudaosList.Add(m_EC_SpecialHoudaos);
            }
            var ssssss = _inquiryCommonModel.AfterWorkList;
            var inquiryInsideModels = _inquiryCommonModel.InquiryInsideList;
            foreach (var c_SpecialHoudaos in m_EC_SpecialHoudaosList)
            {
                List<int> houdaolist = new List<int>();
                string select = "<option value=''>无</option>";
                if (ssssss != null && ssssss.Count > 0)
                {
                    if (_eC_OrderBasic.PrintTypeId != 27)
                    {
                        foreach (var aaaaa in ssssss)
                        {
                            houdaolist.Add(aaaaa);
                        }
                    }
                }
                if (inquiryInsideModels != null && inquiryInsideModels.Count > 0)
                {
                        foreach (var inquiryInsideModel in inquiryInsideModels)
                        {
                            var afterWorkList = inquiryInsideModel.AfterWorkList;
                            if (afterWorkList != null && afterWorkList.Count > 0)
                            {
                                foreach (var aaaaa in afterWorkList)
                                {
                                    houdaolist.Add(aaaaa);
                                }
                            }
                        }
                }
                var sysInquiry_Afters = _afterParameterInfoBLL.GetModelList().Where(x => houdaolist.Contains(x.KeyId)).ToList();
                if (sysInquiry_Afters != null && sysInquiry_Afters.Count > 0)
                {
                    foreach (var item in sysInquiry_Afters)
                    {
                        if (item.ParameterName == c_SpecialHoudaos.PSF_Houdaogongxu)
                        {
                            select += "<option value='" + item.ParameterName + "'  selected=\"selected\" >" + item.ParameterName + "</option>";
                        }
                        else
                        {
                            select += "<option value='" + item.ParameterName + "'>" + item.ParameterName + "</option>";
                        }
                    }
                }
                if (_eC_OrderBasic.PrintTypeId == 29 || _eC_OrderBasic.PrintTypeId == 27)
                {
                    if (_inquiryCommonModel.JTWZ == c_SpecialHoudaos.PSF_Houdaogongxu)
                    {
                        select += "<option value='" + _inquiryCommonModel.JTWZ + "' selected=\"selected\" >" + _inquiryCommonModel.JTWZ + "</option>";
                    }
                    else
                    {
                        select += "<option value='" + _inquiryCommonModel.JTWZ + "' >" + _inquiryCommonModel.JTWZ + "</option>";
                    }
                }
                c_SpecialHoudaos.PSF_Houdaogongxu = select;
            }
            this.RepeaterHoudaoList.DataSource = m_EC_SpecialHoudaosList;
            this.RepeaterHoudaoList.DataBind();
            //获取开料尺寸
            EC_CuttingPaperSpec model = new EC_CuttingPaperSpec();
            //model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "小全开");
@@ -427,6 +507,7 @@
                string[] PSF_PrintedColorRear = Request["PSF_PrintedColorRear"].ToString2().Split(',');
                string[] PSF_Typesetting = Request["PSF_Typesetting"].ToString2().Split(',');
                string[] PSF_Typesettinghide = Request["PSF_Typesettinghide"].ToString2().Split(',');
                string[] PSF_Fabantaoshu = Request["PSF_Fabantaoshu"].ToString2().Split(',');
                string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
                string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
                string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
@@ -465,6 +546,13 @@
                string[] oldPSF_PaperId = Request["oldPSF_PaperId"].ToString2().Split(',');
                string[] oldPSF_BigPaperCount = Request["oldPSF_BigPaperCount"].ToString2().Split(',');
                string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
                string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
                string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
                string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
                string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');
                //if (PSF_Forumsid.Length != PSF_Component.Length || PSF_Forumsid.Length != PSF_PNum.Length || PSF_Forumsid.Length != PSF_PressesDesk.Length || PSF_Forumsid.Length != PSF_PrintedColorPositive.Length || PSF_Forumsid.Length != PSF_PrintedColorRear.Length || PSF_Forumsid.Length != PSF_Typesetting.Length || PSF_Forumsid.Length != PSF_PrintedCount.Length || PSF_Forumsid.Length != PSF_PrintedPositive.Length || PSF_Forumsid.Length != PSF_LastNum.Length || PSF_Forumsid.Length != PSF_SheetSource.Length || PSF_Forumsid.Length != PSF_SpecificationsSheet.Length || PSF_Forumsid.Length != PSF_EditionCount.Length || PSF_Forumsid.Length != PSF_PaperSource.Length || PSF_Forumsid.Length != PSF_PaperId.Length || PSF_Forumsid.Length != PSF_PaperName.Length || PSF_Forumsid.Length != PSF_MaterialSpecifications.Length || PSF_Forumsid.Length != PSF_BigPaperCount.Length || PSF_Forumsid.Length != PSF_OpenSpecifications.Length || PSF_Forumsid.Length != PSF_OpenWidth.Length || PSF_Forumsid.Length != PSF_OpenLength.Length || PSF_Forumsid.Length != PSF_Note.Length)
                //{
                //    JavaScript.MessageBox("提交失败", this);
@@ -502,6 +590,7 @@
                List<EC_SpecialForums> m_EC_SpecialForumsList = new List<EC_SpecialForums>();
                List<OA_Inventory> m_OA_InventoryList = new List<OA_Inventory>();
                List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
                List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList = new List<EC_SpecialHoudaos>();
                for (int i = 0; i < PSF_Forumsid.Length; i++)
                {
@@ -531,7 +620,7 @@
                        m_EC_SpecialForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace(",+-+,", ",");
                    }
                       
                    m_EC_SpecialForums.PSF_Fabantaoshu = PSF_Fabantaoshu[i];
                    if (PSF_PrintedCount[i].ToInt32() == null)
                    {
                        m_EC_SpecialForums.PSF_PrintedCount = 0;
@@ -645,6 +734,16 @@
                        m_EC_SpecialForums.PSF_CTPSpecType = selFilmSpec[i].ToString2().Replace(",+-+,", ",");
                        m_EC_SpecialForums.PSF_CTPCount = 0;
                    }
                    m_EC_SpecialForums.PSF_CTPSpecType = CTPSpecName[i].ToString2().Replace(",+-+,", ",");
                    if (CTPCount[i].ToInt32() == null)
                    {
                        m_EC_SpecialForums.PSF_CTPCount = 0;
                    }
                    else
                    {
                        m_EC_SpecialForums.PSF_CTPCount = CTPCount[i].ToInt32();
                    }
                    m_EC_SpecialForums.PSF_FilmType = "";   
                    m_EC_SpecialForums.PSF_PSSpec = PSF_PSBan[i].ToString2().Replace(",+-+,", ",");
                    if (PSCount[i].ToInt32() == null)
@@ -746,6 +845,26 @@
                        }
                    }
                 }
                for (int i = 0; i < selHoudaogongxu.Length; i++)
                {
                    EC_SpecialHoudaos m_EC_SpecialHoudaos = new EC_SpecialHoudaos();
                    m_EC_SpecialHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace(",+-+,", ",");
                    m_EC_SpecialHoudaos.PSF_Shuliang = txtShuliang[i] ;
                    m_EC_SpecialHoudaos.PSF_Beishu = txtBeishu[i];
                    m_EC_SpecialHoudaos.PSF_Jichang = txtJichang[i];
                    m_EC_SpecialHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
                    if(!string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Houdaogongxu)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Shuliang)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Beishu)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Jichang)
                        || !string.IsNullOrEmpty(m_EC_SpecialHoudaos.PSF_Yaoqiu)){
                        m_EC_SpecialHoudaosList.Add(m_EC_SpecialHoudaos);
                    }
                }
                m_EC_SpecialOrders.LastUpdateTime = DateTime.Now;
                m_EC_SpecialOrders.Operator = CurrentUser.ShortName;
                m_EC_SpecialOrders.PSO_Remarks = this.txtPSO_Remarks.InnerText;
@@ -754,7 +873,7 @@
                if (m_EC_SpecialOrders.Keyid > 0)
                {
                    if (bll_EC_SpecialOrdersBLL.UpdateSpecialForums(m_EC_SpecialOrders, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList))
                    if (bll_EC_SpecialOrdersBLL.UpdateSpecialForums(m_EC_SpecialOrders, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_SpecialHoudaosList))
                        //JavaScript.MessageBox("操作成功", this);
                        JavaScript.RefreshDIVOpener(this);
                    else
@@ -787,7 +906,7 @@
                    m_OA_OrderWorkListRelation.RelationTypeId = 1; //专版1,合版2,后道外协3,整单外协4
                    //bll_EC_SpecialOrdersBLL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList)
                    if (bll_EC_SpecialOrdersBLL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList))
                    if (bll_EC_SpecialOrdersBLL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_SpecialHoudaosList))
                    {
                        //JavaScript.MessageBox("操作成功", this);
                        JavaScript.RefreshDIVOpener(this);
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
@@ -240,6 +240,15 @@
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// RepeaterHoudaoList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepeaterHoudaoList;
        /// <summary>
        /// txtPSO_Work 控件。
        /// </summary>
        /// <remarks>