From fe4f494d66a2049583d3ff427e431d5b88fa4eeb Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 12 三月 2026 08:45:44 +0800
Subject: [PATCH] 20260306  合版工单改成和专版工单一样界面

---
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                       |    1 
 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj                                           |    1 
 CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerForumsDAL.cs                              |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs          |  103 +
 CY_ECommercePlatform/CY.BLL/EC/EC_MergerForumsBLL.cs                                |   54 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs |  117 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx               | 2363 ++++++++++++++++++++++-------
 CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs                                 |  446 +++++
 CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs                                |   18 
 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj                                     |    1 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs            |  859 ++++++----
 CY_ECommercePlatform/AbstractFactory/Factory.cs                                     |    9 
 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj                                         |    1 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs                             |   90 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx             |  190 ++
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs   |  283 ---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx              |    2 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs                             |  181 ++
 CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs                              |   12 
 19 files changed, 3,477 insertions(+), 1,270 deletions(-)

diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 392c1a1..abc2457 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -286,7 +286,8 @@
             OBJECT_PATH.Add(DALInterface.IOA_YujihuikuanDAL, "OA_YujihuikuanDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CuikuanjiluDAL, "OA_CuikuanjiluDAL");
             OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderItemDAL, "CoreDeliverOrderItemDAL");
-            OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderDAL, "CoreDeliverOrderDAL"); 
+            OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderDAL, "CoreDeliverOrderDAL");
+            OBJECT_PATH.Add(DALInterface.IEC_MergerForumsDAL, "EC_MergerForumsDAL");
             #endregion
 
             #region Pay
@@ -1010,6 +1011,12 @@
         /// </summary>
         ICoreDeliverOrderDAL = 1954,
 
+
+        /// <summary>
+        /// 涓撶増鏂藉伐鍗曠増闈㈣〃鏁版嵁璁块棶鎺ュ彛
+        /// </summary>
+        IEC_MergerForumsDAL = 1955,
+
         /// <summary>
         /// 寮�绁ㄧ敵璇�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index ec8d2af..c395aad 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -44,6 +44,7 @@
     <Compile Include="EC\EC_CuttingPaperSpecBLL.cs" />
     <Compile Include="EC\EC_InHomeDataBLL.cs" />
     <Compile Include="EC\EC_MemberBasicBLL.cs" />
+    <Compile Include="EC\EC_MergerForumsBLL.cs" />
     <Compile Include="EC\EC_OnlineAdviserBLL.cs" />
     <Compile Include="EC\EC_OrderDialogueBLL.cs" />
     <Compile Include="EC\EC_OrderPrintParameterBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_MergerForumsBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_MergerForumsBLL.cs
new file mode 100644
index 0000000..e932ff4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_MergerForumsBLL.cs
@@ -0,0 +1,54 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+namespace CY.BLL.OA
+{
+    public class EC_MergerForumsBLL
+    {
+        IEC_MergerForumsDAL idal_IEC_MergerForumsDAL = null;
+
+        public EC_MergerForumsBLL()
+        {
+            idal_IEC_MergerForumsDAL = Factory.GetDALByInterfaceName(DALInterface.IEC_MergerForumsDAL) as IEC_MergerForumsDAL;
+        }
+
+        /// <summary>
+        /// 娣诲姞
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InsertModel(Model.EC_MergerForums model)
+        {
+            return idal_IEC_MergerForumsDAL.InserModel(model);
+        }
+
+        /// <summary>
+        /// 鏇存柊
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Model.EC_MergerForums model)
+        {
+
+            return idal_IEC_MergerForumsDAL.UpdateModel(model);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Model.EC_MergerForums model)
+        {
+
+            return idal_IEC_MergerForumsDAL.DeleteModel(model);
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
index 590bc57..79e5932 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
+++ b/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)
+        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)
         {
-            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);
+            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);
         }
 
          /// <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)
+        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)
         {
-            return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList);
+            return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList,  m_EC_MergerForumsList,  m_OA_InventoryList,  m_OA_OutOfStorageList);
         }
 
         /// <summary>
@@ -140,5 +140,15 @@
         {
             return idal_IEC_MergerSingleDAL.GetOA_OrderWorkListRelationByOrderIdAndTypeId(OrderId,TypeId);
         }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+        /// </summary>
+        /// <param name="Keyid"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid)
+        {
+            return idal_IEC_MergerSingleDAL.GetEC_MergerForumsListByKeyid(Keyid);
+        }
     }
 }
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 3c75750..8b8190b 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -45,6 +45,7 @@
     <Compile Include="EC\IEC_BusinessLimitsBasicInfoDAL.cs" />
     <Compile Include="EC\IEC_DemandDescribeDAL.cs" />
     <Compile Include="EC\IEC_DemandQuoteDAL.cs" />
+    <Compile Include="EC\IEC_MergerForumsDAL.cs" />
     <Compile Include="EC\IEC_OnlineAdviserDAL.cs" />
     <Compile Include="EC\IEC_OrderDialogueDAL.cs" />
     <Compile Include="EC\IEC_OrderOperateDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerForumsDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerForumsDAL.cs
new file mode 100644
index 0000000..020ab36
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerForumsDAL.cs
@@ -0,0 +1,16 @@
+锘縰sing 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_MergerForumsDAL : ICommonDAL, IPaging<EC_MergerForums>, IGetAllModel<EC_MergerForums>
+    {
+    }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
index c10bdb2..9a194b7 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
+++ b/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);
+        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);
 
         /// <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);
+        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);
 
         /// <summary>
         /// 鍒嗛〉鏌ヨ
@@ -77,5 +77,13 @@
         /// <param name="TypeId"></param>
         /// <returns></returns>
         OA_OrderWorkListRelation GetOA_OrderWorkListRelationByOrderIdAndTypeId(int? OrderId, int? TypeId);
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+        /// </summary>
+        /// <param name="Keyid"></param>
+        /// <returns></returns>
+        IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid);
     }
 }
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 1b99e3b..8d19a13 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -58,6 +58,7 @@
     <Compile Include="EC\EC_FirmInfo.cs" />
     <Compile Include="EC\EC_MemberBasic.cs" />
     <Compile Include="EC\EC_MemberExtend.cs" />
+    <Compile Include="EC\EC_MergerForums.cs" />
     <Compile Include="EC\EC_OnlineAdviser.cs" />
     <Compile Include="EC\EC_OrderBasic.cs" />
     <Compile Include="EC\EC_OrderExtend.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs b/CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs
new file mode 100644
index 0000000..6503c8b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_MergerForums.cs
@@ -0,0 +1,446 @@
+锘�/**  
+* 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_MergerForums : IAggregateRoot
+    {
+        public EC_MergerForums()
+        { }
+        #region Model
+        private int? _keyid;
+        private int? _mergerorderid;
+        private int? _psf_forumsid;
+        private string _psf_component;
+        private int? _psf_pnum;
+        private string _psf_pressesdesk;
+        private string _psf_printedcolorpositive;
+        private string _psf_printedcolorrear;
+        private string _psf_typesetting;
+        private int? _psf_printedpositive;
+        private int? _psf_printedcount;
+        private int? _psf_lastnum;
+        private string _psf_papersource;
+        private string _psf_papername;
+        private string _psf_materialspecifications;
+        private int? _psf_bigpapercount;
+        private string _psf_openspecifications;
+        private int? _psf_openwidth;
+        private int? _psf_openlength;
+        private string _psf_note;
+        private int? _psf_paperid;
+        private string _psf_PlateSource;
+        private string _psf_CTPSpecType;
+        private string _psf_FilmType;
+        private int? _psf_CTPCount;
+        private string _psf_PSSpec;
+        private int? _psf_PSCount;
+        public string shifouxianshi { get; set; }
+
+        public string shifouxianshiheban { get; set; }
+
+        public string shifouqitadingdan { get; set; }
+
+
+        public string shifouxianshilunzhuan { get; set; }
+
+        /// <summary>
+        /// 涓婚敭--鏍囪瘑ID
+        /// </summary>
+        public int? Keyid
+        {
+            set { _keyid = value; }
+            get { return _keyid; }
+        }
+        /// <summary>
+        /// 鏂藉伐鍗曞彿
+        /// </summary>
+        public int? MergerOrderId
+        {
+            set { _mergerorderid = value; }
+            get { return _mergerorderid; }
+        }
+        /// <summary>
+        /// 鐗堥潰缂栧彿
+        /// </summary>
+        public int? PSF_Forumsid
+        {
+            set { _psf_forumsid = value; }
+            get { return _psf_forumsid; }
+        }
+        /// <summary>
+        /// 鏋勪欢
+        /// </summary>
+        public string PSF_Component
+        {
+            set { _psf_component = value; }
+            get { return _psf_component; }
+        }
+        /// <summary>
+        /// P鏁�
+        /// </summary>
+        public int? PSF_PNum
+        {
+            set { _psf_pnum = value; }
+            get { return _psf_pnum; }
+        }
+        /// <summary>
+        /// 鍗板埛鏈哄彴
+        /// </summary>
+        public string PSF_PressesDesk
+        {
+            set { _psf_pressesdesk = value; }
+            get { return _psf_pressesdesk; }
+        }
+        /// <summary>
+        /// 鍗拌壊(姝�)
+        /// </summary>
+        public string PSF_PrintedColorPositive
+        {
+            set { _psf_printedcolorpositive = value; }
+            get { return _psf_printedcolorpositive; }
+        }
+        /// <summary>
+        /// 鍗拌壊(鑳�)
+        /// </summary>
+        public string PSF_PrintedColorRear
+        {
+            set { _psf_printedcolorrear = value; }
+            get { return _psf_printedcolorrear; }
+        }
+        /// <summary>
+        /// 鎺掔増鏂瑰紡
+        /// </summary>
+        public string PSF_Typesetting
+        {
+            set { _psf_typesetting = value; }
+            get { return _psf_typesetting; }
+        }
+        /// <summary>
+        /// 鍗板埛姝f暟
+        /// </summary>
+        public int? PSF_PrintedPositive
+        {
+            set { _psf_printedpositive = value; }
+            get { return _psf_printedpositive; }
+        }
+        /// <summary>
+        /// 鍗板埛鏁伴噺
+        /// </summary>
+        public int? PSF_PrintedCount
+        {
+            set { _psf_printedcount = value; }
+            get { return _psf_printedcount; }
+        }
+        /// <summary>
+        /// 鍚庨亾鏀炬暟
+        /// </summary>
+        public int? PSF_LastNum
+        {
+            set { _psf_lastnum = value; }
+            get { return _psf_lastnum; }
+        }
+        /// <summary>
+        /// 绾稿紶鏉ユ簮
+        /// </summary>
+        public string PSF_PaperSource
+        {
+            set { _psf_papersource = value; }
+            get { return _psf_papersource; }
+        }
+        /// <summary>
+        /// 绾稿紶鍚嶇О
+        /// </summary>
+        public string PSF_PaperName
+        {
+            set { _psf_papername = value; }
+            get { return _psf_papername; }
+        }
+        /// <summary>
+        /// 鏉愭枡瑙勬牸
+        /// </summary>
+        public string PSF_MaterialSpecifications
+        {
+            set { _psf_materialspecifications = value; }
+            get { return _psf_materialspecifications; }
+        }
+        /// <summary>
+        /// 澶х焊鏁伴噺
+        /// </summary>
+        public int? PSF_BigPaperCount
+        {
+            set { _psf_bigpapercount = value; }
+            get { return _psf_bigpapercount; }
+        }
+        /// <summary>
+        /// 寮�鏂欒鏍�
+        /// </summary>
+        public string PSF_OpenSpecifications
+        {
+            set { _psf_openspecifications = value; }
+            get { return _psf_openspecifications; }
+        }
+        /// <summary>
+        /// 寮�鏂欏搴�
+        /// </summary>
+        public int? PSF_OpenWidth
+        {
+            set { _psf_openwidth = value; }
+            get { return _psf_openwidth; }
+        }
+        /// <summary>
+        /// 寮�鏂欓暱搴�
+        /// </summary>
+        public int? PSF_OpenLength
+        {
+            set { _psf_openlength = value; }
+            get { return _psf_openlength; }
+        }
+
+        /// <summary>
+        /// 鐗堟潗鏉ユ簮
+        /// </summary>
+        public string PSF_PlateSource
+        {
+            set { _psf_PlateSource = value; }
+            get { return _psf_PlateSource; }
+        }
+        /// <summary>
+        /// CTP瑙勬牸
+        /// </summary>
+        public string PSF_CTPSpecType
+        {
+            set { _psf_CTPSpecType = value; }
+            get { return _psf_CTPSpecType; }
+        }
+        /// <summary>
+        /// 鑿叉灄瑙勬牸
+        /// </summary>
+        public string PSF_FilmType
+        {
+            set { _psf_FilmType = value; }
+            get { return _psf_FilmType; }
+        }
+        /// <summary>
+        /// CTP鏁伴噺
+        /// </summary>
+        public int? PSF_CTPCount
+        {
+            set { _psf_CTPCount = value; }
+            get { return _psf_CTPCount; }
+        }
+        /// <summary>
+        /// PS瑙勬牸
+        /// </summary>
+        public string PSF_PSSpec
+        {
+            set { _psf_PSSpec = value; }
+            get { return _psf_PSSpec; }
+        }
+        /// <summary>
+        /// PS鏁伴噺
+        /// </summary>
+        public int? PSF_PSCount
+        {
+            set { _psf_PSCount = value; }
+            get { return _psf_PSCount; }
+        }
+        /// <summary>
+        /// 娉ㄦ剰浜嬮」
+        /// </summary>
+        public string PSF_Note
+        {
+            set { _psf_note = value; }
+            get { return _psf_note; }
+        }
+        /// <summary>
+        /// 浣跨敤搴撳瓨琛╥d
+        /// </summary>
+        public int? PSF_PaperId
+        {
+            set
+            {
+                _psf_paperid = value;
+            }
+            get
+            {
+                return _psf_paperid;
+            }
+        }
+        #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_Forumsid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.PSF_Forumsid = isChange ? MyConvert.ConvertToInt32(value) : PSF_Forumsid;
+                theValue = this.PSF_Forumsid;
+            }
+            else if ("PSF_Component".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.PSF_Component = isChange ? MyConvert.ConvertToString(value) : PSF_Component;
+                theValue = this.PSF_Component;
+            }
+            else if ("PSF_PNum".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+                this.PSF_PNum = isChange ? MyConvert.ConvertToInt32(value) : PSF_PNum;
+                theValue = this.PSF_PNum;
+            }
+            else if ("PSF_PressesDesk".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.PSF_PressesDesk = isChange ? MyConvert.ConvertToString(value) : PSF_PressesDesk;
+                theValue = this.PSF_PressesDesk;
+            }
+            else if ("PSF_PrintedColorPositive".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+                this.PSF_PrintedColorPositive = isChange ? MyConvert.ConvertToString(value) : PSF_PrintedColorPositive;
+                theValue = this.PSF_PrintedColorPositive;
+            }
+            else if ("PSF_PrintedColorRear".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+                this.PSF_PrintedColorRear = isChange ? MyConvert.ConvertToString(value) : PSF_PrintedColorRear;
+                theValue = this.PSF_PrintedColorRear;
+            }
+            else if ("PSF_Typesetting".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+            {
+                this.PSF_Typesetting = isChange ? MyConvert.ConvertToString(value) : PSF_Typesetting;
+                theValue = this.PSF_Typesetting;
+            }
+            else if ("PSF_PrintedPositive".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+            {
+                this.PSF_PrintedPositive = isChange ? MyConvert.ConvertToInt32(value) : PSF_PrintedPositive;
+                theValue = this.PSF_PrintedPositive;
+            }
+            else if ("PSF_PrintedCount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+            {
+                this.PSF_PrintedCount = isChange ? MyConvert.ConvertToInt32(value) : PSF_PrintedCount;
+                theValue = this.PSF_PrintedCount;
+            }
+            else if ("PSF_LastNum".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+            {
+                this.PSF_LastNum = isChange ? MyConvert.ConvertToInt32(value) : PSF_LastNum;
+                theValue = this.PSF_LastNum;
+            }
+            else if ("PSF_PaperSource".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+            {
+                this.PSF_PaperSource = isChange ? MyConvert.ConvertToString(value) : PSF_PaperSource;
+                theValue = this.PSF_PaperSource;
+            }
+            else if ("PSF_PaperName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+            {
+                this.PSF_PaperName = isChange ? MyConvert.ConvertToString(value) : PSF_PaperName;
+                theValue = this.PSF_PaperName;
+            }
+            else if ("PSF_MaterialSpecifications".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+            {
+                this.PSF_MaterialSpecifications = isChange ? MyConvert.ConvertToString(value) : PSF_MaterialSpecifications;
+                theValue = this.PSF_MaterialSpecifications;
+            }
+            else if ("PSF_BigPaperCount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.PSF_BigPaperCount = isChange ? MyConvert.ConvertToInt32(value) : PSF_BigPaperCount;
+                theValue = this.PSF_BigPaperCount;
+            }
+            else if ("PSF_OpenSpecifications".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+            {
+                this.PSF_OpenSpecifications = isChange ? MyConvert.ConvertToString(value) : PSF_OpenSpecifications;
+                theValue = this.PSF_OpenSpecifications;
+            }
+            else if ("PSF_OpenWidth".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+            {
+                this.PSF_OpenWidth = isChange ? MyConvert.ConvertToInt32(value) : PSF_OpenWidth;
+                theValue = this.PSF_OpenWidth;
+            }
+            else if ("PSF_OpenLength".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+            {
+                this.PSF_OpenLength = isChange ? MyConvert.ConvertToInt32(value) : PSF_OpenLength;
+                theValue = this.PSF_OpenLength;
+            }
+            else if ("PSF_PlateSource".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 25)
+            {
+                this.PSF_PlateSource = isChange ? MyConvert.ConvertToString(value) : PSF_PlateSource;
+                theValue = this.PSF_PlateSource;
+            }
+            else if ("PSF_CTPSpecType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+            {
+                this.PSF_CTPSpecType = isChange ? MyConvert.ConvertToString(value) : PSF_CTPSpecType;
+                theValue = this.PSF_CTPSpecType;
+            }
+            else if ("PSF_FilmType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+            {
+                this.PSF_FilmType = isChange ? MyConvert.ConvertToString(value) : PSF_FilmType;
+                theValue = this.PSF_FilmType;
+            }
+            else if ("PSF_CTPCount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.PSF_CTPCount = isChange ? MyConvert.ConvertToInt32(value) : PSF_CTPCount;
+                theValue = this.PSF_CTPCount;
+            }
+            else if ("PSF_PSSpec".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 29)
+            {
+                this.PSF_PSSpec = isChange ? MyConvert.ConvertToString(value) : PSF_PSSpec;
+                theValue = this.PSF_PSSpec;
+            }
+            else if ("PSF_PSCount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+            {
+                this.PSF_PSCount = isChange ? MyConvert.ConvertToInt32(value) : PSF_PSCount;
+                theValue = this.PSF_PSCount;
+            }
+            else if ("PSF_Note".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 31)
+            {
+                this.PSF_Note = isChange ? MyConvert.ConvertToString(value) : PSF_Note;
+                theValue = this.PSF_Note;
+            }
+            else if ("PSF_PaperId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 32)
+            {
+                this.PSF_PaperId = isChange ? MyConvert.ConvertToInt32(value) : PSF_PaperId;
+                theValue = this.PSF_PaperId;
+            }
+
+            return theValue;
+        }
+        #endregion
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 79fb49e..7c815d1 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -55,6 +55,7 @@
     <Compile Include="EC\EC_DemandPrintParameterDAL.cs" />
     <Compile Include="EC\EC_InHomeDataDAL.cs" />
     <Compile Include="EC\EC_MemberBasicDAL.cs" />
+    <Compile Include="EC\EC_MergerForumsDAL.cs" />
     <Compile Include="EC\EC_OnlineAdviserDAL.cs" />
     <Compile Include="EC\EC_OrderDialogueDAL.cs" />
     <Compile Include="EC\EC_OrderPrintParameterDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs
new file mode 100644
index 0000000..e437e46
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerForumsDAL.cs
@@ -0,0 +1,181 @@
+锘縰sing 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_MergerForumsDAL : IEC_MergerForumsDAL
+    {
+
+        private Database _dataBase = null;
+
+        public EC_MergerForumsDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        public EC_MergerForumsDAL(Database database)
+        {
+            _dataBase = database;
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.EC_MergerForums trueModel = model as Model.EC_MergerForums;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter("@MergerOrderId",trueModel.MergerOrderId),
+                    new SqlParameter("@PSF_Forumsid",trueModel.PSF_Forumsid),
+                    new SqlParameter("@PSF_Component",trueModel.PSF_Component),
+                    new SqlParameter("@PSF_PNum",trueModel.PSF_PNum),
+                    new SqlParameter("@PSF_PressesDesk",trueModel.PSF_PressesDesk),
+                    new SqlParameter("@PSF_PrintedColorPositive",trueModel.PSF_PrintedColorPositive),
+                    new SqlParameter("@PSF_PrintedColorRear",trueModel.PSF_PrintedColorRear),
+                    new SqlParameter("@PSF_Typesetting",trueModel.PSF_Typesetting),
+                    new SqlParameter("@PSF_PrintedPositive",trueModel.PSF_PrintedPositive),
+                    new SqlParameter("@PSF_PrintedCount",trueModel.PSF_PrintedCount),
+                    new SqlParameter("@PSF_LastNum",trueModel.PSF_LastNum),
+                    new SqlParameter("@PSF_PaperSource",trueModel.PSF_PaperSource),
+                    new SqlParameter("@PSF_PaperName",trueModel.PSF_PaperName),
+                    new SqlParameter("@PSF_MaterialSpecifications",trueModel.PSF_MaterialSpecifications),
+                    new SqlParameter("@PSF_BigPaperCount",trueModel.PSF_BigPaperCount),
+                    new SqlParameter("@PSF_OpenSpecifications",trueModel.PSF_OpenSpecifications),
+                    new SqlParameter("@PSF_OpenWidth",trueModel.PSF_OpenWidth),
+                    new SqlParameter("@PSF_OpenLength",trueModel.PSF_OpenLength),
+                    new SqlParameter("@PSF_PlateSource",trueModel.PSF_PlateSource),
+                    new SqlParameter("@PSF_CTPSpecType",trueModel.PSF_CTPSpecType),
+                    new SqlParameter("@PSF_FilmType",trueModel.PSF_FilmType),
+                    new SqlParameter("@PSF_CTPCount",trueModel.PSF_CTPCount),
+                    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)
+            };
+            try
+            {
+                _dataBase.Query("sp_EC_MergerForums_Insert", CommandType.StoredProcedure, 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_MergerForums trueModel = model as Model.EC_MergerForums;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter("@Keyid",trueModel.Keyid),
+                    new SqlParameter("@MergerOrderId",trueModel.MergerOrderId),
+                    new SqlParameter("@PSF_Forumsid",trueModel.PSF_Forumsid),
+                    new SqlParameter("@PSF_Component",trueModel.PSF_Component),
+                    new SqlParameter("@PSF_PNum",trueModel.PSF_PNum),
+                    new SqlParameter("@PSF_PressesDesk",trueModel.PSF_PressesDesk),
+                    new SqlParameter("@PSF_PrintedColorPositive",trueModel.PSF_PrintedColorPositive),
+                    new SqlParameter("@PSF_PrintedColorRear",trueModel.PSF_PrintedColorRear),
+                    new SqlParameter("@PSF_Typesetting",trueModel.PSF_Typesetting),
+                    new SqlParameter("@PSF_PrintedPositive",trueModel.PSF_PrintedPositive),
+                    new SqlParameter("@PSF_PrintedCount",trueModel.PSF_PrintedCount),
+                    new SqlParameter("@PSF_LastNum",trueModel.PSF_LastNum),
+                    new SqlParameter("@PSF_PaperSource",trueModel.PSF_PaperSource),
+                    new SqlParameter("@PSF_PaperName",trueModel.PSF_PaperName),
+                    new SqlParameter("@PSF_MaterialSpecifications",trueModel.PSF_MaterialSpecifications),
+                    new SqlParameter("@PSF_BigPaperCount",trueModel.PSF_BigPaperCount),
+                    new SqlParameter("@PSF_OpenSpecifications",trueModel.PSF_OpenSpecifications),
+                    new SqlParameter("@PSF_OpenWidth",trueModel.PSF_OpenWidth),
+                    new SqlParameter("@PSF_OpenLength",trueModel.PSF_OpenLength),
+                    new SqlParameter("@PSF_PlateSource",trueModel.PSF_PlateSource),
+                    new SqlParameter("@PSF_CTPSpecType",trueModel.PSF_CTPSpecType),
+                    new SqlParameter("@PSF_FilmType",trueModel.PSF_FilmType),
+                    new SqlParameter("@PSF_CTPCount",trueModel.PSF_CTPCount),
+                    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)
+            };
+            try
+            {
+                _dataBase.Query("sp_EC_MergerForums_Update", CommandType.StoredProcedure, 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_MergerForums trueModel = model as Model.EC_MergerForums;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter("@Keyid",trueModel.Keyid)
+            };
+            try
+            {
+                _dataBase.Query("sp_EC_MergerForums_DeleteRow", CommandType.StoredProcedure, 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_MergerForums> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 鍗曚釜鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.EC_MergerForums> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            throw new NotImplementedException();
+        }
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
index 0f59591..dfd84cc 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
+++ b/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)
+        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)
         {
             try
             {
@@ -331,6 +331,7 @@
                 Pay_TradingSingleDAL _pay_TradingSingleDAL = new Pay_TradingSingleDAL(_dataBase);
                 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_OrderExtend orderExtend = orderBasic.OrderExtend;
                 Pay_TradingSingle tradingSingle = orderBasic.TradingSingle;
@@ -451,6 +452,20 @@
                                     return false;
                                 }
                             }
+
+                            foreach (var m_EC_SpecialForums in m_EC_MergerForumsList)
+                            {
+                                if (result)
+                                {
+                                    m_EC_SpecialForums.MergerOrderId = m_EC_MergerSingle.Keyid;
+                                    result = dal_EC_MergerForumsDAL.InserModel(m_EC_SpecialForums);
+
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
                         }
                     }
                     else
@@ -469,9 +484,14 @@
                         else
                             return false;
                     }
-                    OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL();
+                    OA_InventoryDAL dal_OA_InventoryDAL = new OA_InventoryDAL(_dataBase);
+                    OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL(_dataBase);
                     if (result)
                     {
+                        foreach (var m_OA_Inventory in m_OA_InventoryList)
+                        {
+                            dal_OA_InventoryDAL.UpdateModel(m_OA_Inventory);
+                        }
                         foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
                         {
                             m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Merger('" + m_EC_MergerSingle.Keyid + "')\">鍚堢増锛�" + m_EC_MergerSingle.PMS_OrderNum + "</span>");
@@ -499,15 +519,16 @@
         /// <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)
+        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)
         {
             try
             {
                 bool result = false;
                 EC_MergerOrdersDAL dal_EC_MergerOrdersDAL = new EC_MergerOrdersDAL(_dataBase);
+                EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_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>;
                 using (TransactionScope t_TransactionScope = new TransactionScope())
                 {
                     result = UpdateModel(m_EC_MergerSingle);
@@ -533,10 +554,48 @@
                             else
                                 return false;
                         }
+
+                        foreach (var m_EC_MergerForums in m_EC_MergerForumsList_Old)
+                        {
+                            if (result)
+                            {
+                                result = dal_EC_MergerForumsDAL.DeleteModel(m_EC_MergerForums);
+                            }
+                            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;
+                        }
+
                         if (result)
                         {
                             t_TransactionScope.Complete();
                         }
+                    }
+                }
+
+                OA_InventoryDAL dal_OA_InventoryDAL = new OA_InventoryDAL();
+                OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL();
+                if (result)
+                {
+                    foreach (var m_OA_Inventory in m_OA_InventoryList)
+                    {
+                        dal_OA_InventoryDAL.UpdateModel(m_OA_Inventory);
+                    }
+                    foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
+                    {
+                        //m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.Keyid + "')\">涓撶増锛�" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
+                        m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Merger('" + m_EC_MergerSingle.Keyid + "')\">鍚堢増锛�" + m_EC_MergerSingle.PMS_OrderNum + "</span>");
+                        dal_OA_OutOfStorageDAL.InserModel(m_OA_OutOfStorage);
                     }
                 }
                 return result;
@@ -629,5 +688,28 @@
                 throw ex;
             }
         }
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+        /// </summary>
+        /// <param name="Keyid"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid)
+        {
+            try
+            {
+                if (Keyid == null)
+                    return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<EC_MergerForums> result = _dataBase.SelectModel<EC_MergerForums>("*", "EC_MergerForums", string.Format(" MergerOrderId='{0}'", Keyid)) as IList<EC_MergerForums>;//鎵ц鏌ヨ
+
+                return result;//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
index ec0de5f..b580604 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -160,7 +160,7 @@
                 </ItemTemplate>
             </asp:Repeater>
         </table>
-        <table border="1" cellpadding="0" cellspacing="0" style="border-right: 0; border-bottom: 0; text-align: left;">
+        <table border="1" cellpadding="0" cellspacing="0" style="border-right: 0; border-bottom: 0; text-align: left;" id="yuanshi" runat="server" >
             <tr style="border: none; background-color: #E4E4E4;">
                 <th colspan="10" style="text-align: left; text-indent: 5px;">
                     <b>鍗板埛淇℃伅</b>
@@ -287,6 +287,194 @@
                 </tr>
             </tbody>
         </table>
+         <asp:Repeater ID="Repeater1" runat="server">
+                        <ItemTemplate>
+                            <table cellpadding="0" cellspacing="0" style="text-align: center;">
+                                <tr style="border: none; background-color: #E4E4E4;">
+                                    <th colspan="12" style="text-align: left; text-indent: 5px;">
+                                        <b>绗�<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>鐗�</b>
+                                    </th>
+                                </tr>
+                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
+                                    <td rowspan="2">
+                                         鏋勪欢 
+                                    </td>
+                                    <td rowspan="2" colspan="2">
+                                        P鏁� 
+                                    </td>
+                                    <td rowspan="2" colspan="2">
+                                        鍗板埛鏈哄彴
+                                    </td>
+                                    <td colspan="2">
+                                        <span  style="<%#Eval("shifouxianshi")%>" >鍗拌壊</span>   
+                                    </td>
+                                    <td rowspan="2" colspan="2">
+                                       <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>    
+                                    </td>
+                                </tr>
+                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
+                                    <td>
+                                        <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">
+                                        <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
+                                    </td>
+                                    <td colspan="2">
+                                        <%#Eval("PSF_PressesDesk")%>
+                                    </td>
+                                    <td>
+                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorPositive")%></span>       
+                                    </td>
+                                    <td>
+                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
+                                    </td>
+                                    <td colspan="2">
+                                     <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>       
+                                    </td>
+                                    <%--<td>
+                                        <%#Eval("PSF_SheetSource")%>
+                                    </td>
+                                    <td>
+                                        <%#Eval("PSF_SpecificationsSheet")%>
+                                    </td>
+                                    <td>
+                                        <%#Eval("PSF_EditionCount")%>
+                                    </td>--%>
+                                </tr>
+                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>" >
+                                    <td rowspan="2">
+                                     绾稿紶鏉ユ簮
+                                    </td>
+                                    <td rowspan="2" colspan="1">
+                                        绾稿紶鍚嶇О
+                                    </td>
+                                    <td rowspan="2" colspan="1">
+                                        绾稿紶瑙勬牸
+                                    </td>
+                                    <td colspan="3">
+                                      <span  style="<%#Eval("shifouxianshilunzhuan")%>" >绾稿紶鏁伴噺锛堝紶锛�</span>       
+                                    </td>
+                                    <td colspan="4">
+                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏂欒鏍�</span>       
+                                    </td>
+                                </tr>
+                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
+                                    <td>
+                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >绾稿紶鏁伴噺</span>        
+                                    </td>
+                                    <td>
+                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >鍗板埛姝f暟</span>       
+                                    </td>
+                                    <td>
+                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >娑堣��</span>      
+                                    </td>
+                                    <td colspan="1">
+                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏁�</span>      
+                                    </td>
+                                    <td>
+                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >瀹藉害(mm)</span>       
+                                    </td>
+                                    <td>
+                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >闀垮害(mm)</span>      
+                                    </td>
+                                </tr>
+                                <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
+                                    <td>
+                                        <%#Eval("PSF_PaperSource")%>
+                                    </td>
+                                    <td colspan="1">
+                                        <%#Eval("PSF_PaperName")%>
+                                    </td>
+                                    <td colspan="1">
+                                        <%#Eval("PSF_MaterialSpecifications")%>
+                                    </td>
+                                    <%--<td colspan="1">
+                                        <%#0.Equals(Eval("PSF_BigPaperCount")) ? "" : Eval("PSF_BigPaperCount")%>
+                                    </td>--%>
+                                    <td>
+                                        <%#0.Equals(Eval("PSF_PrintedCount")) ? "" : Eval("PSF_PrintedCount")%>
+                                    </td>
+                                    <td>
+                                        <%#0.Equals(Eval("PSF_PrintedPositive")) ? "" : Eval("PSF_PrintedPositive")%>
+                                    </td>
+                                    <td>
+                                        <%#0.Equals(Eval("PSF_LastNum")) ? "" : Eval("PSF_LastNum")%>
+                                    </td>
+                                    <td colspan="1">
+                                        <%#Eval("PSF_OpenSpecifications")%>
+                                    </td>
+                                    <td>
+                                        <%#0.Equals(Eval("PSF_OpenWidth")) ? "" : Eval("PSF_OpenWidth")%>
+                                    </td>
+                                    <td>
+                                        <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
+                                    </td>
+                                </tr>
+                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
+                                    <td>
+                                        <span  style="<%#Eval("shifouxianshi")%>" >鐗堟潗绫诲瀷</span>
+                                    </td>
+                                    <td colspan="2">
+                                         <span  style="<%#Eval("shifouxianshi")%>" >  瑙勬牸</span>
+                                    </td>
+                                    <td id="lbCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
+                                       <span  style="<%#Eval("shifouxianshi")%>" > CTP鏁伴噺锛堝紶锛� </span>
+                                    </td>
+                                    <td id="lbPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
+                                        PS鐗堣鏍�
+                                    </td>
+                                    <td id="lbPSCount" <%#show("PSCount",Eval("PSF_PlateSource").ToString())%>>
+                                        PS鐗堟暟閲�
+                                    </td>
+                                    <td colspan="6">
+                                    </td>
+                                    <tr>
+                                        <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
+                                            <td>
+                                               <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
+                                            </td>
+                                            <td colspan="2">
+                                                <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
+                                            </td>
+                                            <td id="tdCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
+                                              <span  style="<%#Eval("shifouxianshi")%>" >   <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
+                                            </td>
+                                            <td id="tdPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
+                                                <%#Eval("PSF_PSSpec")%>
+                                            </td>
+                                            <td id="tdPsCount" <%#show("PSCount",Eval("PSF_PlateSource").ToString())%>>
+                                                <%#0.Equals(Eval("PSF_PSCount")) ? "" : Eval("PSF_PSCount")%>
+                                            </td>
+                                            <td colspan="6">
+                                            </td>
+                                        </tr>
+                                        <tr style="<%#Eval("shifouqitadingdan")%>">
+                                            <td style="font-weight: bold; background-color: #E6E6E6;">
+                                                鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
+                                            </td>
+                                            <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
+                                                <%#Eval("PSF_PaperName")%>
+                                            </td>
+                                        </tr>
+                                        <tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
+                                            <td style="font-weight: bold; background-color: #E6E6E6;">
+                                                娉ㄦ剰浜嬮」锛�
+                                            </td>
+                                            <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
+                                                <%#Eval("PSF_Note")%>
+                                            </td>
+                                        </tr>
+                            </table>
+                        </ItemTemplate>
+                    </asp:Repeater>
     </div>
     </form>
 </body>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
index 7461408..085dd78 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
@@ -115,12 +115,62 @@
             this.spanPMS_CompletionTime.InnerText = (m_EC_MergerSingle.PMS_CompletionTime ?? DateTime.Now).ToString("yyyy-MM-dd");
             this.spanPMS_TotalPrice.InnerText = (m_EC_MergerSingle.PMS_TotalPrice ?? 0).ToString("0.00");
             this.spanPMS_Remarks.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>;
                 this.RepClientList.DataSource = m_EC_MergerOrdersList;
                 this.RepClientList.DataBind();
+
+
+                List<EC_MergerForums> m_EC_MergerForumsList = bll_EC_MergerSingleBLL.GetEC_MergerForumsListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerForums>;
+
+                if (m_EC_MergerForumsList == null || m_EC_MergerForumsList.Count == 0)
+                {
+                    this.yuanshi.Visible = true;
+                    m_EC_MergerForumsList = new List<EC_MergerForums>();
+                    //EC_MergerForums m_EC_MergerForums = new EC_MergerForums();
+                    //m_EC_MergerForums.PSF_Forumsid = 1;
+                    //m_EC_MergerForumsList.Add(m_EC_MergerForums);
+                }
+                else
+                {
+                    this.yuanshi.Visible = false;
+                }
+
+                foreach (var eC_MergerForums in m_EC_MergerForumsList)
+                {
+                    if (eC_MergerForums.PSF_PressesDesk.IndexOf("鏁扮爜") >= 0 || eC_MergerForums.PSF_PressesDesk.IndexOf("鐩存帴淇垏") >= 0)
+                    {
+                        eC_MergerForums.shifouxianshi = "display:none;";
+                    }
+
+                    if (eC_MergerForums.PSF_PressesDesk.IndexOf("涓庡叾浠栬鍗曞悎鐗�") >= 0)
+                    {
+                        eC_MergerForums.shifouxianshi = "display:none;";
+                        eC_MergerForums.shifouxianshiheban = "display:none;";
+                        eC_MergerForums.shifouqitadingdan = "";
+                    }
+                    else
+                    {
+                        eC_MergerForums.shifouqitadingdan = "display:none;";
+                    }
+
+                    if (eC_MergerForums.PSF_PressesDesk.IndexOf("杞浆") >= 0)
+                    {
+                        eC_MergerForums.shifouxianshilunzhuan = "display:none;";
+
+                    }
+                    else
+                    {
+                        eC_MergerForums.shifouxianshilunzhuan = "";
+                    }
+
+                }
+                this.Repeater1.DataSource = m_EC_MergerForumsList;
+                this.Repeater1.DataBind();
             }
+
             return true;
         }
 
@@ -132,5 +182,58 @@
             bll_EC_MergerSingleBLL.UpdateModel(m_EC_MergerSingle);
             JavaScript.RefreshParent(this);
         }
+
+
+        public string show(string str, string strPlateSource)
+        {
+            string reStr = string.Empty;
+
+            if (strPlateSource == "鏈巶CTP")
+            {
+                if (str == "CTPCount")
+                {
+                    reStr = "style=" + "\"" + "" + "\"";
+                }
+                else if (str == "PSSpec")
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+                else
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+            }
+            else if (strPlateSource == "鑷甫CTP")
+            {
+                if (str == "CTPCount")
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+                else if (str == "PSSpec")
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+                else
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+            }
+            else if (strPlateSource == "鑷甫鑿叉灄" || strPlateSource == "鏈巶鑿叉灄")
+            {
+                if (str == "CTPCount")
+                {
+                    reStr = "style=" + "\"" + "display:none" + "\"";
+                }
+                else if (str == "PSSpec")
+                {
+                    reStr = "style=" + "\"" + "" + "\"";
+                }
+                else
+                {
+                    reStr = "style=" + "\"" + "" + "\"";
+                }
+            }
+            return reStr;
+        }
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
index 074f108..c2416c4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.business {
-    
-    
-    public partial class AgMergerOrderDetail {
-        
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class AgMergerOrderDetail
+    {
+
         /// <summary>
         /// FormCon 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm FormCon;
-        
+
         /// <summary>
         /// hideOrderId 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
-        
+
         /// <summary>
         /// spanSpecialNum_o 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum_o;
-        
+
         /// <summary>
         /// spanExigencyDegree 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanExigencyDegree;
-        
+
         /// <summary>
         /// spanSpecialNum 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum;
-        
+
         /// <summary>
         /// spanOutFirm 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOutFirm;
-        
+
         /// <summary>
         /// spanSpecialOprator 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-        
+
         /// <summary>
         /// spanSpecialTime 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-        
+
         /// <summary>
         /// RepClientList 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepClientList;
-        
+
+        /// <summary>
+        /// yuanshi 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable yuanshi;
+
         /// <summary>
         /// spanPMS_PaperSource 鎺т欢銆�
         /// </summary>
@@ -101,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperSource;
-        
+
         /// <summary>
         /// spanPMS_PaperName 鎺т欢銆�
         /// </summary>
@@ -110,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperName;
-        
+
         /// <summary>
         /// spanSelfPaperName 鎺т欢銆�
         /// </summary>
@@ -119,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfPaperName;
-        
+
         /// <summary>
         /// spanPMS_PaperSpecification 鎺т欢銆�
         /// </summary>
@@ -128,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperSpecification;
-        
+
         /// <summary>
         /// spanSelfPaperSpec 鎺т欢銆�
         /// </summary>
@@ -137,7 +148,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfPaperSpec;
-        
+
         /// <summary>
         /// spanPMS_PaperCount 鎺т欢銆�
         /// </summary>
@@ -146,7 +157,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperCount;
-        
+
         /// <summary>
         /// spanPMS_PaperPositive 鎺т欢銆�
         /// </summary>
@@ -155,7 +166,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperPositive;
-        
+
         /// <summary>
         /// spanPMS_PaperConsume 鎺т欢銆�
         /// </summary>
@@ -164,7 +175,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperConsume;
-        
+
         /// <summary>
         /// spanPMS_Machine 鎺т欢銆�
         /// </summary>
@@ -173,7 +184,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_Machine;
-        
+
         /// <summary>
         /// spanPSF_Typesetting 鎺т欢銆�
         /// </summary>
@@ -182,7 +193,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSF_Typesetting;
-        
+
         /// <summary>
         /// spanPMS_IsRevisedEdition 鎺т欢銆�
         /// </summary>
@@ -191,7 +202,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_IsRevisedEdition;
-        
+
         /// <summary>
         /// spanPMS_IsColorSamples 鎺т欢銆�
         /// </summary>
@@ -200,7 +211,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_IsColorSamples;
-        
+
         /// <summary>
         /// spanPMS_ChromaticNumber 鎺т欢銆�
         /// </summary>
@@ -209,7 +220,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_ChromaticNumber;
-        
+
         /// <summary>
         /// spanPlateSource 鎺т欢銆�
         /// </summary>
@@ -218,7 +229,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlateSource;
-        
+
         /// <summary>
         /// spanCTPSpec 鎺т欢銆�
         /// </summary>
@@ -227,7 +238,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCTPSpec;
-        
+
         /// <summary>
         /// spanSelfCTPSpec 鎺т欢銆�
         /// </summary>
@@ -236,7 +247,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfCTPSpec;
-        
+
         /// <summary>
         /// spanSelfFilmSpec 鎺т欢銆�
         /// </summary>
@@ -245,7 +256,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfFilmSpec;
-        
+
         /// <summary>
         /// lbCTPCount 鎺т欢銆�
         /// </summary>
@@ -254,7 +265,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbCTPCount;
-        
+
         /// <summary>
         /// tdCTPCount 鎺т欢銆�
         /// </summary>
@@ -263,7 +274,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdCTPCount;
-        
+
         /// <summary>
         /// spanCTPCount 鎺т欢銆�
         /// </summary>
@@ -272,7 +283,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCTPCount;
-        
+
         /// <summary>
         /// lbPSSpec 鎺т欢銆�
         /// </summary>
@@ -281,7 +292,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSSpec;
-        
+
         /// <summary>
         /// tdPSSpec 鎺т欢銆�
         /// </summary>
@@ -290,7 +301,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPSSpec;
-        
+
         /// <summary>
         /// spanPSbanSpec 鎺т欢銆�
         /// </summary>
@@ -299,7 +310,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSbanSpec;
-        
+
         /// <summary>
         /// lbPSCount 鎺т欢銆�
         /// </summary>
@@ -308,7 +319,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSCount;
-        
+
         /// <summary>
         /// tdPsCount 鎺т欢銆�
         /// </summary>
@@ -317,7 +328,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPsCount;
-        
+
         /// <summary>
         /// spanPSCount 鎺т欢銆�
         /// </summary>
@@ -326,7 +337,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSCount;
-        
+
+        /// <summary>
+        /// tdBlank 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell tdBlank;
+
         /// <summary>
         /// spanPMS_CompletionTime 鎺т欢銆�
         /// </summary>
@@ -335,7 +355,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_CompletionTime;
-        
+
         /// <summary>
         /// spanPMS_TotalPrice 鎺т欢銆�
         /// </summary>
@@ -344,7 +364,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_TotalPrice;
-        
+
         /// <summary>
         /// spanPMS_Remarks 鎺т欢銆�
         /// </summary>
@@ -353,5 +373,14 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_Remarks;
+
+        /// <summary>
+        /// Repeater1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater Repeater1;
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index d6166fc..bce9706 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -6,389 +6,11 @@
     <title>鍚堢増鏂藉伐鍗�</title>
     <uc:CMSHead ID="CMSHead1" runat="server" />
          <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
-    <script type="text/javascript">
-      
-        $(function () {
-            $("input[name='PMS_PaperPositive']").blur(function () {
-                var PMS_PaperCount = parseInt($("input[name='PMS_PaperCount']").val());
-                var PMS_PaperPositive = parseInt($("input[name='PMS_PaperPositive']").val());
-                var PMS_PaperConsume = parseInt($("input[name='PMS_PaperConsume']").val());
-                if (PMS_PaperCount < PMS_PaperPositive) {
-                    alertMsg("鎵�濉鏁颁笉鑳藉ぇ浜庣焊寮犳暟閲�");
-                    $("input[name='PMS_PaperPositive']").val("0");
-                } else {
-                    var o_money = PMS_PaperCount - PMS_PaperPositive;
-                    if (isNaN(o_money)) {
-                        $("input[name='PMS_PaperConsume']").val("0");
-                    } else {
-                        $("input[name='PMS_PaperConsume']").val(o_money);
-                    }
-                }
-            });
-            $("input[name='PMS_PaperConsume']").blur(function () {
-                var PMS_PaperCount = parseInt($("input[name='PMS_PaperCount']").val());
-                var PMS_PaperPositive = parseInt($("input[name='PMS_PaperPositive']").val());
-                var PMS_PaperConsume = parseInt($("input[name='PMS_PaperConsume']").val());
-                if (PMS_PaperCount < (PMS_PaperConsume + PMS_PaperPositive)) {
-                    alertMsg("鎵�娑堣�楁暟涓嶈兘澶т簬绾稿紶鏁伴噺");
-                    $("input[name='PMS_PaperConsume']").val("0");
-                } else {
-                    var o_money = PMS_PaperCount - PMS_PaperConsume;
-                    if (isNaN(o_money)) {
-                        $("input[name='PMS_PaperPositive']").val("0");
-                    } else {
-                        $("input[name='PMS_PaperPositive']").val(o_money);
-                    }
-                }
-            });
-
-            $(".CTP_o").change(function () {
-                $(".Film_o").val("");
-                $(".PS_o").val("");
-            });
-            $(".Film_o").change(function () {
-                $(".CTP_o").val("");
-                $(".PS_o").val("");
-            });
-            $(".PS_o").change(function () {
-                $(".Film_o").val("");
-                $(".CTP_o").val("");
-            });
-
-            $("#PMS_PaperSource").change();
-            $("#selPlateType").change();
-
-
-            $(".xialap").hover(function () {
-                $(this).find(".xialapb").show();
-            }, function () {
-                $(this).find(".xialapb").hide();
-            });
-
-            $(".xialapr").hover(function () {
-                $(this).find(".xialapb").show();
-                $(this).removeClass("xialapr").addClass("xialaprh");
-            }, function () {
-                $(this).removeClass("xialaprh").addClass("xialapr");
-                $(this).find(".xialapb").hide();
-            });
-
-            $(".xialapr").click(function () {
-                $(this).parent().parent().find("input").val($(this).text());
-                $(".xialapb").hide();
-            });
-            
-
-
-            var selmachine = document.getElementById('selPMS_Machine');
-
-            if (selmachine.value.indexOf('杞浆') >= 0) {
-                //var select = document.getElementById("PSF_Typesetting");
-                //var option = select.options[0]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option.text = "鎵g増";
-                //option.value = "鎵g増";
-
-                //var option1 = select.options[1]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option1.text = "鍗曢潰";
-                //option1.value = "鍗曢潰";
-                // 鑾峰彇select鍏冪礌
-               
-                var selectElement = document.getElementById('PSF_Typesetting');
-
-                var sssssss = selectElement.value;
-
-                // 娓呯┖鐜版湁鐨刼ption
-                selectElement.innerHTML = '';
-
-                const newOptions = [
-                    { value: '鎵g増', text: '鎵g増' },
-                    { value: '鍗曢潰', text: '鍗曢潰' }
-
-                ];
-
-                // 4. 鎵归噺鏂板option鍒皊elect涓紙2绉嶆柟娉曪紝鎸夐渶閫夋嫨锛�
-                // 鏂规硶1锛氬惊鐜垱寤篛ption瀵硅薄锛堟爣鍑咲OM鎿嶄綔锛屾帹鑽愶紝鍏煎鎬ф渶濂斤級
-                newOptions.forEach(option => {
-                    // 鍒涘缓option鍏冪礌锛歯ew Option(鏄剧ず鏂囨湰, 瀹為檯鍊�)
-                    const opt = new Option(option.text, option.value);
-                    // 灏唎ption娣诲姞鍒皊elect涓�
-                    selectElement.add(opt);
-                });
-
-                selectElement.value = sssssss;
-            } else {
-                //var select = document.getElementById("PSF_Typesetting");
-                //var option = select.options[0]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option.text = "鎵g増";
-                //option.value = "鎵g増";
-
-                //var option1 = select.options[1]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option1.text = "鍗曢潰";
-                //option1.value = "鍗曢潰";
-                // 鑾峰彇select鍏冪礌
-                var selectElement = document.getElementById('PSF_Typesetting');
-                var sssssss = selectElement.value;
-                // 娓呯┖鐜版湁鐨刼ption
-                selectElement.innerHTML = '';
-
-                const newOptions = [
-                    { value: '鑷炕', text: '鑷炕' },
-                    { value: '婊氱炕', text: '婊氱炕' },
-                    { value: '鎵g増', text: '鎵g増' },
-                    { value: '鍗曢潰', text: '鍗曢潰' }
-
-                ];
-
-                // 4. 鎵归噺鏂板option鍒皊elect涓紙2绉嶆柟娉曪紝鎸夐渶閫夋嫨锛�
-                // 鏂规硶1锛氬惊鐜垱寤篛ption瀵硅薄锛堟爣鍑咲OM鎿嶄綔锛屾帹鑽愶紝鍏煎鎬ф渶濂斤級
-                newOptions.forEach(option => {
-                    // 鍒涘缓option鍏冪礌锛歯ew Option(鏄剧ず鏂囨湰, 瀹為檯鍊�)
-                    const opt = new Option(option.text, option.value);
-                    // 灏唎ption娣诲姞鍒皊elect涓�
-                    selectElement.add(opt);
-                });
-
-                selectElement.value = sssssss;
-            }
-
-
-        });
-    </script>
-    <script type="text/javascript">
-        function PaperSourceChange(sel) 
-       {
-           if ('鏉ヨ嚜浠撳簱' != sel.value)
-           {
-               document.getElementById('StoreBtn').style.display = "none";
-               document.getElementById('PMS_PaperName').style.display = "none";
-               document.getElementById('selPaperName').style.display = "";
-               document.getElementById('PMS_PaperSpecification').style.display = "none";
-               document.getElementById('SelPaperSpec').style.display = "";
-           }
-           else 
-           {
-               document.getElementById('StoreBtn').style.display = "";
-               document.getElementById('PMS_PaperName').style.display = "";
-               document.getElementById('selPaperName').style.display = "none";
-               document.getElementById('PMS_PaperSpecification').style.display = "";
-               document.getElementById('SelPaperSpec').style.display = "none";
-           }
-       }
-       function PlateChange(sel) 
-       {
-           if ('1' == sel.value) 
-           {
-               document.getElementById('BtnStorePlate').style.display = "";
-               document.getElementById('PlateSpec').style.display = "";
-               document.getElementById('selCTPSpec').style.display = "none";
-               document.getElementById('selFilmSpec').style.display = "none";
-               document.getElementById('lbCTPCount').style.display = "";
-               document.getElementById('tdCTPCount').style.display = "";
-           }
-           else 
-           {
-               document.getElementById('BtnStorePlate').style.display = "none";
-               document.getElementById('PlateSpec').style.display = "none";
-               document.getElementById('lbCTPCount').style.display = "none";
-               document.getElementById('tdCTPCount').style.display = "none";
-               if ('0' == sel.value) {
-                   document.getElementById('selCTPSpec').style.display = "";
-                   document.getElementById('selFilmSpec').style.display = "none";
-                   document.getElementById('tdBlank').colSpan = "6"
-               }
-               else 
-               {
-                   document.getElementById('selCTPSpec').style.display = "none";
-                   document.getElementById('selFilmSpec').style.display = "";
-                   document.getElementById('tdBlank').colSpan = "2";
-               }
-           }
-           if ('2' == sel.value || '3' == sel.value) {
-
-               document.getElementById('lbPSSpec').style.display = "";
-               document.getElementById('tdPSSpec').style.display = "";
-               document.getElementById('lbPSCount').style.display = "";
-               document.getElementById('tdPsCount').style.display = "";
-           }
-           else 
-           {
-               document.getElementById('lbPSSpec').style.display = "none";
-               document.getElementById('tdPSSpec').style.display = "none";
-               document.getElementById('lbPSCount').style.display = "none";
-               document.getElementById('tdPsCount').style.display = "none";
-           }
-       }
-       function TrimChange(sel)
-       {
-           if ("涓嶄慨鍒�" == sel.value) 
-           {
-               document.getElementById('PrintSizeName').value = "";
-           }   
-        }
-
-
-        $("#PSF_Typesetting").live("change", function () {
-
-
-            if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 ) {
-                if ($("#PSF_Typesetting").val() == "鎵g増" || $("#PMS_ChromaticNumber").val() == "2") {
-                    $("#CTPCount").val("2");
-                } else {
-                    $("#CTPCount").val("1");
-                }
-            }
-
-          
-            if ( $("#selPMS_Machine").val().indexOf('榛戠櫧') >= 0) {
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("2");
-                } else {
-                    $("#CTPCount").val("1");
-                }
-            }
-
-            if ($("#selPMS_Machine").val().indexOf('鍥涜壊') >= 0 || $("#selPMS_Machine").val().indexOf('鍏壊') >= 0) {
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("8");
-                } else {
-                    $("#CTPCount").val("4");
-                }
-            }
-
-
-        });
-
-
-
-        $("#PMS_ChromaticNumber").live("change", function () {
-
-            if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 ) {
-                if ($("#PSF_Typesetting").val() == "鎵g増" || $("#PMS_ChromaticNumber").val() == "2") {
-                    $("#CTPCount").val("2");
-                } else {
-                    $("#CTPCount").val("1");
-                }
-            }
-
-           
-
-        });
-
-
-        /*
-浜ゆ槗瀹㈡埛閫変腑鍊煎彂鐢熸敼鍙�
-*/
-        function custormerChange(sel) {
-            if (window.isDataLoading) {
-                return;
-            }
-            if (sel.value.indexOf('鍏紑') >= 0) {
-                document.getElementById('PlateSpec').value = '395*460';
-                document.getElementById('PMS_ChromaticNumber').value = '1';
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("2");
-                } else {
-                    $("#CTPCount").val("1");
-                }
-
-            } else if (sel.value.indexOf('鍥涜壊') >= 0) {
-                document.getElementById('PlateSpec').value = '770*1030';
-                document.getElementById('PMS_ChromaticNumber').value = '4';
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("8");
-                } else {
-                    $("#CTPCount").val("4");
-                }
-            } else if (sel.value.indexOf('鍏壊') >= 0) {
-                document.getElementById('PlateSpec').value = '790*1030';
-                document.getElementById('PMS_ChromaticNumber').value = '4';
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("8");
-                } else {
-                    $("#CTPCount").val("4");
-                }
-            } else if (sel.value.indexOf('榛戠櫧') >= 0) {
-                document.getElementById('PlateSpec').value = '760*920';
-                document.getElementById('PMS_ChromaticNumber').value = '1';
-                if ($("#PSF_Typesetting").val() == "鎵g増") {
-                    $("#CTPCount").val("2");
-                } else {
-                    $("#CTPCount").val("1");
-                }
-            } else if (sel.value.indexOf('杞浆') >= 0) {
-                document.getElementById('PlateSpec').value = '579*810';
-                document.getElementById('PMS_ChromaticNumber').value = '1';
-                document.getElementById('CTPCount').value = '2';
-            } else {
-                document.getElementById('CTPCount').value = '';
-            }
-
-
-            if (sel.value.indexOf('杞浆') >= 0) {
-                //var select = document.getElementById("PSF_Typesetting");
-                //var option = select.options[0]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option.text = "鎵g増";
-                //option.value = "鎵g増";
-
-                //var option1 = select.options[1]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option1.text = "鍗曢潰";
-                //option1.value = "鍗曢潰";
-                // 鑾峰彇select鍏冪礌
-                var selectElement = document.getElementById('PSF_Typesetting');
-
-                // 娓呯┖鐜版湁鐨刼ption
-                selectElement.innerHTML = '';
-
-                const newOptions = [
-                    { value: '鎵g増', text: '鎵g増' },
-                    { value: '鍗曢潰', text: '鍗曢潰' }
-
-                ];
-
-                // 4. 鎵归噺鏂板option鍒皊elect涓紙2绉嶆柟娉曪紝鎸夐渶閫夋嫨锛�
-                // 鏂规硶1锛氬惊鐜垱寤篛ption瀵硅薄锛堟爣鍑咲OM鎿嶄綔锛屾帹鑽愶紝鍏煎鎬ф渶濂斤級
-                newOptions.forEach(option => {
-                    // 鍒涘缓option鍏冪礌锛歯ew Option(鏄剧ず鏂囨湰, 瀹為檯鍊�)
-                    const opt = new Option(option.text, option.value);
-                    // 灏唎ption娣诲姞鍒皊elect涓�
-                    selectElement.add(opt);
-                });
-            } else {
-                //var select = document.getElementById("PSF_Typesetting");
-                //var option = select.options[0]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option.text = "鎵g増";
-                //option.value = "鎵g増";
-
-                //var option1 = select.options[1]; // index鏄淇敼鐨刼ption鐨勭储寮�
-                //option1.text = "鍗曢潰";
-                //option1.value = "鍗曢潰";
-                // 鑾峰彇select鍏冪礌
-                var selectElement = document.getElementById('PSF_Typesetting');
-
-                // 娓呯┖鐜版湁鐨刼ption
-                selectElement.innerHTML = '';
-
-                const newOptions = [
-                    { value: '鑷炕', text: '鑷炕' },
-                    { value: '婊氱炕', text: '婊氱炕' },
-                     { value: '鎵g増', text: '鎵g増' },
-                    { value: '鍗曢潰', text: '鍗曢潰' }
-
-                ];
-
-                // 4. 鎵归噺鏂板option鍒皊elect涓紙2绉嶆柟娉曪紝鎸夐渶閫夋嫨锛�
-                // 鏂规硶1锛氬惊鐜垱寤篛ption瀵硅薄锛堟爣鍑咲OM鎿嶄綔锛屾帹鑽愶紝鍏煎鎬ф渶濂斤級
-                newOptions.forEach(option => {
-                    // 鍒涘缓option鍏冪礌锛歯ew Option(鏄剧ず鏂囨湰, 瀹為檯鍊�)
-                    const opt = new Option(option.text, option.value);
-                    // 灏唎ption娣诲姞鍒皊elect涓�
-                    selectElement.add(opt);
-                });
-            }
-           
-           
-        }
-    </script>
+     <style type="text/css">
+        body { font-family: 寰蒋闆呴粦; }
+        tr { line-height: 20px; }
+    </style>
+  
 </head>
 <body>
     <form method="post" class="form2" runat="server">
@@ -547,129 +169,228 @@
         </asp:Repeater>
     </table>
     <table class="tableStyle" style="width: 98%; margin: 5px auto;" usehover="false" useclick="false">
-        <tr>
-            <th colspan="10">
-                <b>鍗板埛淇℃伅</b>
-            </th>
-        </tr>
+        
         <tbody>
-            <tr>
-                <td class="ali03 w70px ">
-                    绾稿紶鏉ユ簮锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"  name="PMS_PaperSource" onchange='PaperSourceChange(this)' runat="server" id="PMS_PaperSource" style=" width:80px;">
-                        <option value="鏉ヨ嚜浠撳簱">鏉ヨ嚜浠撳簱</option>
-                        <option value="鑷甫绾�">鑷甫绾�</option>
-                    </select><label class="Btnb CangKubtn_o" style="margin-left: 2px;"><input type="button" class="Btn FromWarehouse" value="杩炴帴浠撳簱" id="StoreBtn"  /></label><input type="hidden"  runat="server" name="PSF_PaperId" value="" id="PSF_PaperId1" /><input type="hidden"  runat="server" name="PMS_PaperCount1" value="" id="PMS_PaperCount1" />
-                </td>
-                <td class="ali03 w70px ">
-                    绾稿紶鍚嶇О锛�
-                </td>
-                <td>
-                    <input type="text" class="noJ " name="PMS_PaperName" style="width:80px" id="PMS_PaperName" runat = "server" />
-                    <select keepDefaultStyle="true"  name="selPaperName" style=" display:none; width:80px" runat="server"  id="selPaperName" ></select>
-                </td>
-                <td class="ali03 w70px ">
-                    绾稿紶瑙勬牸锛�
-                </td>
-                <td>
-                    <input type="text" class="noJ " name="PMS_PaperSpecification" style="width:80px" id="PMS_PaperSpecification" runat = "server"/>
-                    <select keepDefaultStyle="true"  name="SelPaperSpec" style=" display:none; width:80px"  runat="server"  id="SelPaperSpec"></select>
-                </td>
-                <td class="ali03 w70px ">
-                    绾稿紶鏁伴噺锛�
-                </td>
-                <td colspan="3">
-                    <input type="text" class="noJ w40px" name="PMS_PaperCount" runat="server" id="PMS_PaperCount" />寮�(鍏朵腑姝f暟<input type="text" class="noJ w40px" name="PMS_PaperPositive"  runat ="server" id = "PMS_PaperPositive"/>寮�,娑堣��<input type="text" class="noJ w40px" name="PMS_PaperConsume" runat = "server" id="PMS_PaperConsume" />寮�)
-                </td>
-            </tr>
-            <tr>
-              <td class="ali03 w70px ">
-                    鍗板埛鏈哄彴锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"  name="PMS_Machine" id="selPMS_Machine" runat="server" style=" width:80px;" onchange='custormerChange(this)'>
-                        <option value="">璇烽�夋嫨</option>
-                        <option value="1寮�鏈�">1寮�鏈�</option>
-                        <option value="2寮�鏈�">2寮�鏈�</option>
-                        <option value="3寮�鏈�">3寮�鏈�</option>
-                        <option value="4寮�鏈�">4寮�鏈�</option>
-                        <option value="8寮�鏈�">8寮�鏈�</option>
-                    </select>
-                </td>
-                <td class="ali03 w70px ">
-                    鍗板埛鏂瑰紡锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"   name="PSF_Typesetting" id="PSF_Typesetting" runat = "server" style="width:80px">
-                        <option value="鑷炕">鑷炕</option>
-                        <option value="婊氱炕">婊氱炕</option>
-                        <option value="鎵g増">鎵g増</option>
-                        <option value="鍗曢潰">鍗曢潰</option>
-                    </select>
-                </td>
-                <td class="ali03 w70px ">
-                    鏄惁淇増锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"  name="PMS_IsRevisedEdition" runat = "server" id="PMS_IsRevisedEdition" style="width:80px">
-                        <option value="true">淇増</option>
-                        <option value="false" selected ="selected">涓嶄慨鐗�</option>
-                    </select>
-                </td>
-                <td class="ali03 w70px ">
-                    鑹叉牱锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"  id="PMS_IsColorSamples" name="PMS_IsColorSamples"  runat="server" style="width:80px">
-                        <option selected="selected" value="">璇烽�夋嫨</option>
-                        <option value="鏃�">鏃�</option>
-                        <option value="鍘熸牱">鍘熸牱</option>
-                        <option value="鏁扮爜鏍�">鏁扮爜鏍�</option>
-                        <option value="鍗板埛鏍�">鍗板埛鏍�</option>
-                        <option value="鐓х墖姣旂収">鐓х墖姣旂収</option>
-                        <option value="鍏朵粬">鍏朵粬</option>
-                    </select>
-                </td>
-                <td class="ali03 w70px ">
-                    鑹叉暟锛�
-                </td>
-                <td>
-                    <select keepDefaultStyle="true"  id="PMS_ChromaticNumber" name="PMS_ChromaticNumber" runat = "server" >
-                        <option value="1">鍗曡壊</option>
-                        <option value="2">鍙岃壊</option>
-                        <option value="3">涓夎壊</option>
-                        <option selected="selected" value="4">鍥涜壊</option>
-                        <option value="4+涓�">鍥�+涓�</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="ali03 w70px " style="display:none;">
-                   <%-- 鐗堟潗绫诲瀷锛�--%>
-                </td>
-                <td style="display:none;">
-                     <select keepDefaultStyle="true"   name="selPlateType" onchange='PlateChange(this)' runat = "server" id="selPlateType" style=" width:80px;display:none;">
-                        <option selected="selected" value="1">鏈巶CTP</option>
-                        <option value="0">鑷甫CTP</option>
-                        <option value="2">鑷甫鑿叉灄</option>
-                        <option value="3">鏈巶鑿叉灄</option>
-                    </select><label class="Btnb CangKubtn_o" style="margin-left: 2px;display:none;"><input type="button" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate"  /></label><input type="hidden" runat="server" name="PSF_PaperId" id="PSF_PaperId2" />         
-                </td>
-                <td class="ali03 w70px ">
-                   瑙勬牸锛�
-                </td>
-                <td>
-                     
-                 <%--   <input type="text" class="noJ " name="CTPSpecName" style="width:80px" id="PlateSpec"  runat = "server"/>--%>
-                    <%-- <select keepDefaultStyle="true"  name="CTPSpecName" id="PlateSpec"  runat="server" style="width:80px" >
+             <tr>
+            <td colspan="2" align="center">
+                  <asp:Repeater ID="Repeater1" runat="server">
+                    <ItemTemplate>
+                        <table style="width: 98%; margin: 5px auto; text-align: center;" class="tableStyle AddTab" usehover="false" useclick="false" value_id="<%#Container.ItemIndex + 1%>">
+                            <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>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
+                                <td rowspan="2" style="width: 195px;">
+                                 鏋勪欢
+                                </td>
+                                <td rowspan="2" colspan="2" >
+                                  P鏁�
+                                </td>
+                                <td rowspan="2" colspan="2">
+                                    鍗板埛鏈哄彴
+                                </td>
+                                <td colspan="2"   >
+                                    <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗拌壊</p>        
+                                </td>
+                                <td rowspan="2" colspan="2">
+                                    <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>      
+                                </td>
+                                 
+                            </tr>
+                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"   >
+                                <td>
+                                  <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>
+                                <td>
+                                    <select keepdefaultstyle="true" class="" name="PSF_Component" value_ppwaerid="<%#Container.ItemIndex + 1%>"     >
+                                        <option value="" selected="selected">-鏃�-</option>
+                                        <option value="灏侀潰">灏侀潰</option>
+                                        <option value="鍐呴〉">鍐呴〉</option>
+                                    </select>
 
-                     </select> --%>
-               
-                    <div class="xialap">
-                             <input type="text" class="noJ " name="CTPSpecName" style="width:80px" id="PlateSpec"  runat = "server"/>
+                                   
+                                </td>
+                                <td colspan="2">
+                                    <input type="text" class="  w80px  int " msg="璇峰~鍐欐暟瀛�" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
+                                </td>
+                                <td colspan="2">
+                                    <select keepdefaultstyle="true" class="  w120px" name="PSF_PressesDesk"    value_selspec="<%#Container.ItemIndex + 1%>">
+                                        <%--<option value="">璇烽�夋嫨</option>--%>
+                                        <%=PressesDeskHtml %>
+                                    </select>
+                                </td>
+                                <td  >
+                                    <select keepdefaultstyle="true" class="" name="PSF_PrintedColorPositive"  value_selspec="<%#Container.ItemIndex + 1%>" >
+                                           <option value="" >璇烽�夋嫨</option>
+                                        <option value="鍗曡壊" selected="selected">鍗曡壊</option>
+                                        <option value="鍙岃壊">鍙岃壊</option>
+                                        <option value="涓夎壊">涓夎壊</option>
+                                        <option value="鍥涜壊" >鍥涜壊</option>
+                                        <option value="鍥�+涓�">鍥�+涓�</option>
+                                    </select>
+                                </td>
+                                <td>
+                                    <select keepdefaultstyle="true" class="" name="PSF_PrintedColorRear" value_ppwaerid="<%#Container.ItemIndex + 1%>">
+                                           <option value="" >璇烽�夋嫨</option>
+                                        <option value="0鑹�">0鑹�</option>
+                                        <option value="鍗曡壊" selected="selected">鍗曡壊</option>
+                                        <option value="鍙岃壊">鍙岃壊</option>
+                                        <option value="涓夎壊">涓夎壊</option>
+                                        <option value="鍥涜壊" >鍥涜壊</option>
+                                        <option value="鍥�+涓�">鍥�+涓�</option>
+                                    </select>
+                                </td>
+                                <td colspan="2">
+                                    <select keepdefaultstyle="true" class="" name="PSF_Typesetting" value_ppwaerid="<%#Container.ItemIndex + 1%>">
+                                        <option value="鑷炕">鑷炕</option>
+                                        <option value="婊氱炕">婊氱炕</option>
+                                        <option value="鎵g増">鎵g増</option>
+                                        <option value="鍗曢潰">鍗曢潰</option>
+                                    </select>
+
+                                     <select keepdefaultstyle="true" class="" name="PSF_Typesettinghide" value_ppwaerid="<%#Container.ItemIndex + 1%>" style="display:none;">
+                                         <option value="鍗曢潰">鍗曢潰</option>
+                                           <option value="鍙岄潰">鍙岄潰</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">
+                                    绾稿紶鏉ユ簮
+                                </td>
+                                <td rowspan="2" colspan="1">
+                                    绾稿紶鍚嶇О
+                                </td>
+                                <td rowspan="2" colspan="1">
+                                    绾稿紶瑙勬牸
+                                </td>
+                                <td colspan="3">
+                                <p name="PSF_Zhizhangshuliang" value_selspecspan="<%#Container.ItemIndex + 1%>">绾稿紶鏁伴噺锛堝紶锛�</p>     
+                                </td>
+                                <td colspan="4">
+                                  <p name="PSF_Kailiaoguige" value_selspecspan="<%#Container.ItemIndex + 1%>">寮�鏂欒鏍�</p>   
+                                </td>
+                            </tr>
+                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"  name="PSF_PrintedPaperTdtr"  value_selspec="<%#Container.ItemIndex + 1%>">
+                                <td>
+                                   <p name="PSF_Zhizhangshulianga" value_selspecspan="<%#Container.ItemIndex + 1%>">绾稿紶鏁伴噺</p>      
+                                </td>
+                                <td>
+                                  <p name="PSF_Yinshuazhengshu" value_selspecspan="<%#Container.ItemIndex + 1%>">鍗板埛姝f暟</p>       
+                                </td>
+                                <td>
+                                  <p name="PSF_Xiaohao" value_selspecspan="<%#Container.ItemIndex + 1%>">娑堣��</p>      
+                                </td>
+                                <td colspan="1" >
+                                <p name="PSF_OpenSpecificationsspan" value_selspecspan="<%#Container.ItemIndex + 1%>">寮�鏁�</p>    
+                                </td>
+                                <td>
+                                 <p name="PSF_Kuandu" value_selspecspan="<%#Container.ItemIndex + 1%>">瀹藉害(mm)  </p>            
+                                </td>
+                                <td>
+                                   <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">闀垮害(mm)</p>      
+                                </td>
+                            </tr>
+                            <tr name="PSF_PrintedPaperTdtrtr"  value_selspec="<%#Container.ItemIndex + 1%>">
+                                <td>
+                                    <select keepdefaultstyle="true" class="  w80px" name="PSF_PaperSource" value_selwaerid="<%#Container.ItemIndex + 1%>" value_name="" value_type="" value_soure="">
+                                        <option value="鏉ヨ嚜浠撳簱">鏉ヨ嚜浠撳簱</option>
+                                        <option value="鑷甫绾�">鑷甫绾�</option>
+                                    </select><label class="Btnb" style="margin-left: 10px;">
+                                        <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouse" value="杩炴帴浠撳簱" id="StoreBtn" /></label><input type="hidden" name="PSF_PaperId" value_ppwaerid="<%#Container.ItemIndex + 1%>" value="<%#Eval("PSF_PaperId")%>" /><input type="hidden" name="PMS_PaperCount1" value_ppwaerid="<%#Container.ItemIndex + 1%>" value="" /><input type="hidden" name="oldPSF_PaperId" value="<%#Eval("PSF_PaperId")%>" /><input type="hidden" name="oldPSF_BigPaperCount" value="<%#Eval("PSF_BigPaperCount")%>" />
+                                </td>
+                                <td colspan="1">
+                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt PSF_PaperName" name="PSF_PaperName" value='<%#Eval("PSF_PaperName")%>' id="PSF_PaperName" />
+                                    <select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="selPaperName" style="display: none; width: 80px" id="selPaperName" class="sel selPaperName">
+                                        <option value="">璇烽�夋嫨</option>
+                                        <%=selPaperNameHtml %>
+                                    </select>
+                                </td>
+                                <td colspan="1">
+                                    <input type="text" class="txt PSF_MaterialSpecifications" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_MaterialSpecifications" id="PSF_MaterialSpecifications" value='<%#Eval("PSF_MaterialSpecifications")%>' />
+                                    <select keepdefaultstyle="true" class="sel SelPaperSpec" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="SelPaperSpec" style="display: none; width: 80px" id="SelPaperSpec">
+                                        <option value="">璇烽�夋嫨</option>
+                                        <%=SelPaperSpecHtml %>
+                                    </select>
+                                </td>
+                                <td colspan="1">
+                                    <input type="text" class="  w80px  int " msg="璇峰~鍐欐暟瀛�" name="PSF_PrintedCount" value="<%#Eval("PSF_PrintedCount")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
+                                </td>
+                                <td colspan="1">
+                                    <input type="text" class="  w80px  int " msg="璇峰~鍐欐暟瀛�" name="PSF_PrintedPositive" value="<%#Eval("PSF_PrintedPositive")%>" value_positiveid="<%#Container.ItemIndex + 1%>" />
+                                </td>
+                                <td colspan="1">
+                                    <input type="text" class="  w80px  int " msg="璇峰~鍐欐暟瀛�" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
+                                </td>
+                                <td colspan="1">
+                                    <select keepdefaultstyle="true" class="  w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
+                                        <option value="">璇烽�夋嫨</option>
+                                        <%=selCuttingPaperSpecHtml%>
+                                    </select>
+                                </td>
+                                <td>
+                                    <input type="text" class="  w80px  int " msg="璇峰~鍐欐暟瀛�" name="PSF_OpenWidth" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
+
+                                    <div class="xialap"   value_ppwaerid='<%#Container.ItemIndex + 1%>' style="display:none;" >
+                             <input type="text" class="  w80px  int " value_ppwaerid='<%#Container.ItemIndex + 1%>'  name="PSF_OpenWidthName"   value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>"    />
                             <div class="xialapb" >
+                              
+                                <div class="xialapr">755</div>
+                                <div class="xialapr">760</div>
+                                <div class="xialapr">765</div>  
+                                <div class="xialapr">770</div> 
+                            </div>
+                        </div>
+                                </td>
+                                <td>
+                                    <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%">
+                                <td style="display:none;">
+                                    鐗堟潗绫诲瀷
+                                </td>
+                                <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 id="lbPSSpec" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbPSSpec" colspan="2" style="display: none">
+                                    PS鐗堣鏍�
+                                </td>
+                                <td id="lbPSCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbPSCount" colspan="4" style="display: none">
+                                    PS鐗堟暟閲�
+                                </td>
+                                <td colspan="7">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="display:none;">
+                                    <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
+                                        <option value="鏈巶CTP">鏈巶CTP</option>
+                                        <option value="鑷甫CTP">鑷甫CTP</option>
+                                        <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
+                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>
+                                    </select>
+                                    <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%>' >
+                                      <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>
@@ -679,52 +400,57 @@
                                 <div class="xialapr">10000</div>--%>
                             </div>
                         </div>
-                    
-                    
-                    <select keepDefaultStyle="true"  name="selCTPSpec"  runat="server" style="display:none;width:80px" id="selCTPSpec" runat = "server"></select> 
-                    <select keepDefaultStyle="true"  name="selFilmSpec"  runat="server" style="display:none;width:80px" id="selFilmSpec" runat = "server"></select> 
-                </td>
-                <td class="ali03 w70px " id="lbCTPCount" runat = "server">
-                    CTP鏁伴噺锛�
-                </td>
-                <td  id="tdCTPCount" runat = "server">
-                    <input type="text" class="noJ  PS_o" name="CTPCount" style="width:80px" id="CTPCount" runat = "server" />
-                </td>
-                <td class="ali03 w70px " id="lbPSSpec" style="display:none" runat="server">
-                    PS鐗堣鏍硷細
-                </td>
-                <td id="tdPSSpec" style="display:none" runat="server">
-                    <input type="text" class="noJ  PS_o" name="PMS_PSBan" style="width:80px;" runat = "server" id="PMS_PSBan" /><label class="Btnb CangKubtn_o" style="margin-left: 2px;"><input type="button" class="Btn FromWarehouseByBanCai1" value="杩炴帴浠撳簱" id="BtnPs"  /></label><input type="hidden" runat="server" name="PSF_PaperId" id="PSF_PaperId3" /> 
+                                    <select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="sel selCTPSpec" name="selCTPSpec" style="display: none; width: 80px" id="selCTPSpec">
+                                        <option value="">璇烽�夋嫨</option>
+                                        <%=selCTPSpecHtml %>
+                                    </select>
+                                    <select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="sel selFilmSpec" name="selFilmSpec" style="display: none; width: 80px" id="selFilmSpec">
+                                        <option value="">璇烽�夋嫨</option>
+                                        <%=selFilmSpecHtml %>
+                                    </select>
+                                </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 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;">
+                                        <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai1" value="杩炴帴浠撳簱" id="BtnPs" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId3" />
+                                </td>
+                                <td id="tdPsCount" style="display: none" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdPsCount" colspan="4">
+                                    <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt PSCount" name="PSCount" style="width: 80px" id="PSCount" value="<%#Eval("PSF_PSCount")%>" />
+                                </td>
+                                <td colspan="7">
+                                </td>
+                            </tr>
+                            <tr  class="PSF_Qitadingdanhao" value_ppwaerid='<%#Container.ItemIndex + 1%>'   style="display:none;">
+                                <td style="font-weight: bold; background-color: #E6E6E6;">
+                                    鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
+                                </td>
+                                <td colspan="12"  align="left" >
+                                   <input type="text"   name="PSF_Qitadingdanhao"  style="width: 50%;"   value_ppwaerid="<%#Container.ItemIndex + 1%>"value="<%#Eval("PSF_PaperName")%>" maxlength="50" /> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <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>
+                                </td>
+                            </tr>
+                        </table>
+                    </ItemTemplate>
+                </asp:Repeater>
+            </td>
+        </tr>
 
-                  <%--  <label class="Btnb CangKubtn_o" style="margin-left: 2px;"><input type="button" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnPs"  /></label><input type="hidden" name="PSF_PaperId" /> --%>
-
-                </td>
-                <td class="ali03 w70px " id="lbPSCount" style="display:none" runat="server">
-                    PS鐗堟暟閲忥細
-                </td>
-                <td id="tdPsCount" style="display:none" runat="server">
-                    <input type="text" class="noJ  PS_o" name="PSCount" style="width:80px" id="PSCount" runat = "server" />
-                </td>
-                <td id="tdBlank" colspan = "6">
-                </td>
-                
-            </tr>
             <tr>
-                <td class="ali03 w70px ">
-                    瀹屽伐鏃堕棿锛�
-                </td>
-                <td>
-                    <input type="text" class="date" name="PMS_CompletionTime" style=" width:140px;" runat = "server"  id ="PMS_CompletionTime"/>
-                </td>
-                <td class="ali03 w70px ">
-                   <%-- 閲戦锛�--%>
-                </td>
-                <td>
-                    <input type="text" class="float req " min="0" name="PMS_TotalPrice" style="width:80px;display:none;" runat = "server" id="PMS_TotalPrice" value="0" />
-                </td>
-                <td colspan="6">
-                </td>
-            </tr>
+            <td colspan="2" align="center">
+                <input type="button" class="Btn AddForums" value="娣诲姞鐗堥潰" />
+                <input type="button" class="Btn CutForums" value="鍑忓皯鐗堥潰" />  &nbsp; &nbsp; &nbsp; &nbsp;
+            </td>
+        </tr>
             <tr>
                 <td class="ali03 w70px " >
                 澶囨敞锛�
@@ -742,61 +468,1514 @@
             </tr>
         </tbody>
     </table>
-    <div style=" display:none;">
-    <div id='ReceiptT_Html' style=" display:none;"></div>
-    </div>
+   
     </form>
-    <script type="text/javascript">
-        ReceiptT('member', '<%=targetid %>',6,100);
-    </script>
-    <script type="text/javascript">
-        function CorrectText() {
-            $("input[name='PO_Requirement']").each(function (ii, vv) {
-                $(vv).val($(vv).val().replace(/[,]/g, "锛�+-+锛�"));
-            });
-        }
-        function GetGoodsData(value_pparid, goodsName, SpecificationName, InventoryCounttext, Keyid, papernum1) {
-            if (value_pparid == "1") {
-                $("input[name='PMS_PaperName']").val(goodsName);
-                $("input[name='PMS_PaperSpecification']").val(SpecificationName);
-                $("input[name='PMS_PaperCount']").val(InventoryCounttext);
-                $("input[name='PSF_PaperId1']").val(Keyid);
-                $("input[name='PMS_PaperCount1']").val(papernum1);
-            }
-            else if (value_pparid == "2") {
-                $("input[name='PlateSpec']").val(SpecificationName);
-                $("input[name='CTPCount']").val(InventoryCounttext);
-                $("input[name='PSF_PaperId2']").val(Keyid);
-            }
-            else if (value_pparid == "3") {
-                $("input[name='PMS_PSBan']").val(SpecificationName);
-                $("input[name='PSCount']").val(InventoryCounttext);
-                $("input[name='PSF_PaperId3']").val(Keyid);
-            }
-        }
+     <script type="text/javascript">
+         var value_WaerId = 0;
+         $(function () {
 
-        $(function () {
-            $(".FromWarehouse").click(function () {
-                var value_pparid = "1";
-                top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=绾稿紶&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+             //            $(".PSF_PrintedPositive[value_ppwaerid='" + value_SelWaerIdNum + "']").blur(function () {
+             $("input[name='PSF_PrintedPositive']").blur(function () {
+                 var value_SelWaerIdNum = $(this).attr("value_positiveid");
+                 var PSF_PrintedCount = parseInt($("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerIdNum + "']").val());
+                 var PSF_PrintedPositive = parseInt($("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val());
+                 var PSF_LastNum = parseInt($("input[name='PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val());
+                 if (PSF_PrintedCount < PSF_PrintedPositive) {
+                     alertMsg("鎵�濉氦璐ф鏁颁笉鑳藉ぇ浜庣焊寮犳暟閲�");
+                     $("input['PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val("0");
+                     $("input['PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val(PSF_PrintedCount);
+                 } else {
+                     var o_money = PSF_PrintedCount - PSF_PrintedPositive;
+                     if (isNaN(o_money)) {
+                         $("input['PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val("0");
+                     } else {
+                         $("input['PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val(o_money);
+                     }
+                 }
+             });
+
+             $("input[name='PSF_LastNum']").blur(function () {
+                 var value_SelWaerIdNum = $(this).attr("value_lastNumid");
+                 var PSF_PrintedCount = parseInt($("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerIdNum + "']").val());
+                 var PSF_PrintedPositive = parseInt($("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val());
+                 var PSF_LastNum = parseInt($("input[name='PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val());
+                 if (PSF_PrintedCount < PSF_LastNum) {
+                     alertMsg("鎵�濉焊寮犳秷鑰椾笉鑳藉ぇ浜庣焊寮犳暟閲�");
+                     $("input['PSF_LastNum'][value_lastNumid='" + value_SelWaerIdNum + "']").val("0");
+                     $("input['PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val(PSF_PrintedCount);
+                 } else {
+                     var o_money = PSF_PrintedCount - PSF_LastNum;
+                     if (isNaN(o_money)) {
+                         $("input['PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val("0");
+                     } else {
+                         $("input['PSF_PrintedPositive'][value_positiveid='" + value_SelWaerIdNum + "']").val(o_money);
+                     }
+                 }
+             });
+             $(".AddForums").click(function () {
+                 $(".ForumName").last().show();
+                 var value_id = parseInt($(".AddTab").last().attr("value_id"));
+                 $(".AddTab").last().after($(".AddTab").last().clone(true));
+                 $(".AddTab").last().attr("value_id", value_id + 1);
+                 $(".xialap").last().attr("value_ppwaerid", value_id + 1);
+                 $(".AddTab span").last().text(value_id + 1);
+                 $(".FromWarehouse").last().attr("value_WaerId", value_id + 1);
+                 $("input[name='PSF_PaperId']").last().attr("value_PpWaerId", value_id + 1);
+                 $("input[name='PMS_PaperCount1']").last().attr("value_PpWaerId", value_id + 1);
+                 $("input[name='PSF_Forumsid']").last().val(value_id + 1);
+                 $("input[name='PSF_BigPaperCount']").last().attr("value_PpWaerId", value_id + 1);
+                 $("select[name='PSF_PaperSource']").last().attr("value_SelWaerId", value_id + 1);
+
+                 $(".FromWarehouse").last().show();
+                 $(".ForumName").last().show();
+                 $("input[name='PSF_PaperName']").last().attr("value_ppwaerid", value_id + 1);
+                 $("input[name='PSF_MaterialSpecifications']").last().attr("value_ppwaerid", value_id + 1);
+                 $("select[name='selPaperName']").last().attr("value_ppwaerid", value_id + 1);
+                 $("select[name='SelPaperSpec']").last().attr("value_ppwaerid", value_id + 1);
+
+
+
+                 $("input[name='PSF_PrintedPositive']").last().attr("value_positiveid", value_id + 1);
+                 $("input[name='PSF_LastNum']").last().attr("value_lastNumid", value_id + 1);
+                 $("input[name='PSF_PrintedCount']").last().attr("value_ppwaerid", value_id + 1);
+                 $("select[name='PSF_OpenSpecifications']").last().attr("value_selSpec", value_id + 1);
+                 $("p[name='PSF_OpenSpecificationsspan']").last().attr("value_selspecspan", value_id + 1);
+
+                 $("p[name='PSF_Zhizhangshuliang']").last().attr("value_selspecspan", value_id + 1);
+                 $("p[name='PSF_Kailiaoguige']").last().attr("value_selspecspan", value_id + 1);
+                 $("p[name='PSF_Zhizhangshulianga']").last().attr("value_selspecspan", value_id + 1);
+                 $("p[name='PSF_Yinshuazhengshu']").last().attr("value_selspecspan", value_id + 1);
+                 $("p[name='PSF_Xiaohao']").last().attr("value_selspecspan", value_id + 1);
+                 $("p[name='PSF_Kuandu']").last().attr("value_selspecspan", value_id + 1);
+
+
+                 $("p[name='PSF_OpenWidthspan']").last().attr("value_openwidthspan", value_id + 1);
+                 $("p[name='PSF_yinse']").last().attr("value_openwidthspan", value_id + 1);
+                 $("p[name='PSF_yinsezheng']").last().attr("value_openwidthspan", value_id + 1);
+                 $("p[name='PSF_yinshufangshi']").last().attr("value_openwidthspan", value_id + 1);
+                 $("p[name='PSF_yinsebei']").last().attr("value_openwidthspan", value_id + 1);
+                 $("select[name='PSF_PrintedColorRear']").last().attr("value_ppwaerid", value_id + 1);
+                 $("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);
+                 $("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);
+
+                 $("select[name='selPlateType']").last().attr("value_selwaerid", value_id + 1);
+                 $(".FromWarehouseByBanCai").last().attr("value_waerid", value_id + 1);
+                 $(".CTPSpecName").last().attr("value_ppwaerid", value_id + 1);
+                 $(".CTPCount").last().attr("value_ppwaerid", value_id + 1);
+                 $(".lbCTPCount").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);
+                 $("input[name='PSF_PNum']").last().attr("value_ppwaerid", value_id + 1);
+                 
+                 $(".tdCTPCount").last().attr("value_ppwaerid", value_id + 1);
+                 $(".selCTPSpec").last().attr("value_ppwaerid", value_id + 1);
+                 $(".selFilmSpec").last().attr("value_ppwaerid", value_id + 1);
+                 $(".lbPSSpec").last().attr("value_ppwaerid", value_id + 1);
+                 $(".tdPSSpec").last().attr("value_ppwaerid", value_id + 1);
+                 $(".lbPSCount").last().attr("value_ppwaerid", value_id + 1);
+                 $(".tdPsCount").last().attr("value_ppwaerid", value_id + 1);
+                 $("input[name='PSF_PaperId2']").last().attr("value_PpWaerId", value_id + 1);
+                 $("input[name='PSF_PaperId3']").last().attr("value_PpWaerId", value_id + 1);
+
+
+
+
+
+
+
+                 $("tr[name='PSF_PrintedPaperTd']").last().attr("value_selspec", value_id + 1);
+                 $("tr[name='PSF_PrintedPaperTdtr']").last().attr("value_selspec", value_id + 1);
+                 $("tr[name='PSF_PrintedPaperTdtrtr']").last().attr("value_selspec", value_id + 1);
+
+                 $("select[name='PSF_Typesettinghide']").last().attr("value_ppwaerid", value_id + 1);
+
+
+                 //                $("select[name='PSF_OpenSpecifications']").last().val("灏忓叏寮�");
+                 //$("p[name='PSF_OpenSpecificationsspan']").last().text("寮�鏁�");
+                 //$("p[name='PSF_OpenWidthspan']").last().text("闀垮害(mm)");
+                 $("select[name='PSF_OpenSpecifications']").last().change();
+                 $("select[name='PSF_PrintedColorRear']").last().change();
+
+                 $("select[name='PSF_PaperSource']").last().val("鏉ヨ嚜浠撳簱");
+                 $("select[name='PSF_PaperSource']").last().change();
+
+                 $("select[name='selPlateType']").last().val("鏈巶CTP");
+                 $("select[name='selPlateType']").last().change();
+
+                 $("select[name='PSF_OpenSpecifications']").last().val("8寮�");
+                 $("select[name='PSF_OpenSpecifications']").last().change();
+                 $("input[name='CTPSpecName']").last().val("395*460");
+                 $("input[name='PSF_PNum']").last().val("");
+
+                 if ($("select[name='PSF_Component']").first().val() == "灏侀潰") {
+                     $("select[name='PSF_Component']").last().val("鍐呴〉");
+
+                      
+                }
+
+
+                $("input[name='PSF_PaperName']").last().val("");
+                $("input[name='PSF_MaterialSpecifications']").last().val("");
+                $("input[name='PSF_PrintedCount']").last().val("");
+                $("input[name='PSF_PrintedPositive']").last().val("");
+                $("input[name='PSF_LastNum']").last().last().val("");
+                // $("input[name='CTPSpecName']").last().val("");
+                $("input[name='CTPCount']").last().last().val("");
+                $("select[name='PSF_PressesDesk']").last().change();
+
             });
-            $(".FromWarehouseByBanCai").click(function () {
-                var value_pparid = "2";
-                top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=鐗堟潗&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+
+            $(".CutForums").click(function () {
+                var value_id = parseInt($(".AddTab").last().attr("value_id"));
+                if (value_id == 1) {
+                } else {
+                    $(".AddTab").last().remove();
+                }
             });
-            $(".FromWarehouseByBanCai1").click(function () {
-                var value_pparid = "3";
-                top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=鐗堟潗&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+
+            $("select[name='PSF_PaperSource']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_SelWaerId");
+                if ($(this).val() == "鏉ヨ嚜浠撳簱") {
+                    $(".FromWarehouse[value_WaerId='" + value_SelWaerId + "']").show();
+                    $(".PSF_PaperName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_MaterialSpecifications[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".selPaperName[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".SelPaperSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                } else {
+                    $("input[name='PSF_PaperId'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                    $("input[name='PMS_PaperCount1'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                    $(".FromWarehouse[value_WaerId='" + value_SelWaerId + "']").hide();
+                    $(".PSF_PaperName[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".PSF_MaterialSpecifications[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".selPaperName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".SelPaperSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
+                }
             });
+
+
+            $("select[name='PSF_Component']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_ppwaerid");
+
+                if ($(this).val() == "灏侀潰") {
+                    $("input[name='PSF_PNum'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+
+
+
+                } else {
+                    $("input[name='PSF_PNum'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                }
+            });
+
+
+            $("select[name='selPlateType']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_selwaerid");
+
+                if ($(this).val() == "鏈巶CTP") {
+                    $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").show();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $(".lbPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                } else if ($(this).val() == "鑷甫CTP") {
+
+                    $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").hide();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $(".lbPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                }
+                else {
+
+                    $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").hide();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    $(".lbPSSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                }
+            });
+
+            $("select[name='PSF_OpenSpecifications']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_selSpec");
+                if ($(this).val() == "灏忓叏寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[0]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[0] %>");
+
+                }
+                else if ($(this).val() == "2寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[1]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[1] %>");
+                }
+                else if ($(this).val() == "3寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[2]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[2] %>");
+                }
+                else if ($(this).val() == "4寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[3]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[3] %>");
+                }
+                else if ($(this).val() == "6寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[4]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[4] %>");
+                }
+                else if ($(this).val() == "8寮�") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[5]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[5] %>");
+                }
+                else if ($(this).val() == "鍏跺畠") {
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Width[6]%>");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("<%=Lenth[6] %>");
+                }
+                else {
+
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                }
+            });
+
+
+            $("select[name='PSF_Typesetting']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_ppwaerid");
+                if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0 ) {
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増" || $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val() == "鍙岃壊") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+                    }
+                }
+
+
+                if ( $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('榛戠櫧') >= 0) {
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+                    }
+                }
+
+                if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍥涜壊') >= 0 || $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏壊') >= 0) {
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+                    }
+                }
+
+            
+            });
+
+
+
+
+            $("select[name='PSF_PrintedColorPositive']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_selspec");
+                if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0) {
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増" || $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val() == "鍙岃壊") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+                    }
+                }
+
+
+            });
+
+
+
+            $("select[name='PSF_PressesDesk']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_selspec");
+
+                if ($(this).val().indexOf('灏忔.') >= 0) {
+                    var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
+
+
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectPSF_PrintedColorPositive.empty();
+
+                    const newOptions1 = [
+                        { value: '鍗曡壊', text: '鍗曡壊' },
+                        { value: '鍙岃壊', text: '鍙岃壊' },
+                        { value: '涓夎壊', text: '涓夎壊' },
+                        { value: '鍥涜壊', text: '鍥涜壊' },
+                    ];
+
+
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml1 = '';
+                    newOptions1.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectPSF_PrintedColorPositive.html(optionHtml1); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+
+
+                    var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
+
+
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectPSF_PrintedColorRear.empty();
+
+                    const newOptions2 = [
+                        { value: '0鑹�', text: '0鑹�' },
+                        { value: '鍗曡壊', text: '鍗曡壊' },
+                        { value: '鍙岃壊', text: '鍙岃壊' },
+                        { value: '涓夎壊', text: '涓夎壊' },
+                        { value: '鍥涜壊', text: '鍥涜壊' },
+                    ];
+
+
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml2 = '';
+                    newOptions2.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectPSF_PrintedColorRear.html(optionHtml2); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+                } else {
+                    var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
+
+
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectPSF_PrintedColorPositive.empty();
+
+                    const newOptions1 = [
+                        { value: '鍗曡壊', text: '鍗曡壊' },
+                        { value: '鍙岃壊', text: '鍙岃壊' },
+                        { value: '涓夎壊', text: '涓夎壊' },
+                        { value: '鍥涜壊', text: '鍥涜壊' },
+                        { value: '鍥�+涓�', text: '鍥�+涓�' },
+                    ];
+
+
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml1 = '';
+                    newOptions1.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectPSF_PrintedColorPositive.html(optionHtml1); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+
+
+                    var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
+
+
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectPSF_PrintedColorRear.empty();
+
+                    const newOptions2 = [
+                        { value: '0鑹�', text: '0鑹�' },
+                        { value: '鍗曡壊', text: '鍗曡壊' },
+                        { value: '鍙岃壊', text: '鍙岃壊' },
+                        { value: '涓夎壊', text: '涓夎壊' },
+                        { value: '鍥涜壊', text: '鍥涜壊' },
+                        { value: '鍥�+涓�', text: '鍥�+涓�' },
+                    ];
+
+
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml2 = '';
+                    newOptions2.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectPSF_PrintedColorRear.html(optionHtml2); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+                }
+
+
+                if ($(this).val().indexOf('鍏紑') >= 0) {
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8寮�");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+                    }
+                   
+                      
+                }
+                else if ($(this).val().indexOf('鍥涜壊') >= 0) {
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    //$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+                    }
+                }
+                else if ($(this).val().indexOf('鍏壊') >= 0) {
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                   // $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+                    }
+                }
+                else if ($(this).val().indexOf('榛戠櫧') >= 0) {
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
+                    if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵g増") {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    } else {
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+                    }
+                }
+                else if ($(this).val().indexOf('杞浆') >= 0) {
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
+                    
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                   
+
+
+
+
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+                    if ($(this).val().indexOf('灏忔.') >= 0) {
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
+                        $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("900*570");
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+                    }
+                }
+                // else if () {
+                //    //$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                //    //$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                //    //$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                //    //$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                //    //$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                //    //$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+                   
+                //    //$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                //    //$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                //    //$("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                //    //$("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+              
+                  
+                //    //$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                //    //$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+                   
+                //    //$("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+                //    //$("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                //    //$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                //    //$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                //    //$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("");
+                //    //$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+
+
+                //}
+                else if ($(this).val().indexOf('鐩存帴淇垏') >= 0 || $(this).val().indexOf('鏁扮爜') >= 0 || $(this).val().indexOf('琛ュ崟') >= 0 ) {
+                    
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
+                    $("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锛屽紑濮嬪瓧绗︿覆涓簊tart锛岀粨鏉熷瓧绗︿覆涓篹nd
+                                    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();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                }
+                else if ($(this).val().indexOf('涓庡叾浠栬鍗曞悎鐗�') >= 0) {
+
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+
+                
+
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+                    $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+                    $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                    $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                    $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                }
+
+
+              
+
+                if ($(this).val().indexOf('杞浆') >= 0) {
+                    var selectElement =  $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']");
+
+                    
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectElement.empty();
+
+                    const newOptions = [
+                        { value: '鎵g増', text: '鎵g増' },
+                        { value: '鍗曢潰', text: '鍗曢潰' }
+
+                    ];
+
+
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml = '';
+                    newOptions.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectElement.html(optionHtml); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+                    $("p[name='PSF_Zhizhangshuliang'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_Kailiaoguige'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_Zhizhangshulianga'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_Yinshuazhengshu'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_Xiaohao'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_Kuandu'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_LastNum'][value_lastnumid='" + value_SelWaerId + "']").hide();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                   
+                }
+                else {
+                    var selectElement = $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']")
+
+
+                    // 娓呯┖鐜版湁鐨刼ption
+                    selectElement.empty();
+
+                    const newOptions = [
+                        { value: '鑷炕', text: '鑷炕' },
+                        { value: '婊氱炕', text: '婊氱炕' },
+                        { value: '鎵g増', text: '鎵g増' },
+                        { value: '鍗曢潰', text: '鍗曢潰' }
+
+                    ];
+
+                    // 3. 鎵归噺鏂板option鍒皊elect涓�
+                    let optionHtml = '';
+                    newOptions.forEach(item => {
+                        // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                        optionHtml += `<option value="${item.value}">${item.text}</option>`;
+                    });
+                    selectElement.html(optionHtml); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+                    $("p[name='PSF_Zhizhangshuliang'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_Kailiaoguige'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_Zhizhangshulianga'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_Yinshuazhengshu'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_Xiaohao'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_Kuandu'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                    $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_LastNum'][value_lastnumid='" + value_SelWaerId + "']").show();
+                    $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    if ($(this).val().indexOf('榛戠櫧') >= 0) {
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    }
+
+
+                }
+
+
+
+             
+
+              });
+            
+
+            $("select[name='PSF_PrintedColorRear']").live("change", function () {
+                var value_SelWaerId = $(this).attr("value_ppwaerid");
+                if ($(this).val() == "0鑹�") {
+                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曢潰");
+                }
+            });
+
+            $("input[name='PSF_Forumsid']").each(function (ii, vv) {
+                var keyid = "<%=keyidstr %>";
+                if (keyid != "") {
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Component']").val($(vv).attr("value_hide_psf_component"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PressesDesk']").val($(vv).attr("value_hide_psf_pressesdesk"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorPositive']").val($(vv).attr("value_hide_psf_printedcolorpositive"));
+                    $(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_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"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='SelPaperSpec']").val($(vv).attr("value_hide_psf_SelPaperSpec"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='selPlateType']").val($(vv).attr("value_hide_psf_selPlateType"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='selCTPSpec']").val($(vv).attr("value_hide_psf_selCTPSpec"));
+                    $(vv).parent().parent().parent().parent().parent().find("select[name='selFilmSpec']").val($(vv).attr("value_hide_psf_selFilmSpec"));
+
+                }
+            });
+
+
+            //            $(".FromWarehouse").click(function () {
+            //                var value_pparid = $(this).attr("value_waerid");
+            //                top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=绾稿紶&&value_pparid=" + value_pparid, Width: 800, Height: 560, Title: "閫夋嫨璐у搧鍙傛暟" });
+            //            });
+
+            $("select[name='PSF_PaperSource']").each(function (ii, vv) {
+
+                $(vv).change();
+            });
+            $("select[name='selPlateType']").each(function (ii, vv) {
+                $(vv).change();
+            });
+           
+            $("select[name='PSF_OpenSpecifications']").each(function (ii, vv) {
+                var keyid = "<%=keyidstr %>";
+                 if (keyid != "") {
+
+                 } else {
+                     $(vv).val("8寮�");
+
+                 }
+             });
+
+            $("select[name='PSF_OpenSpecifications']").each(function (ii, vv) {
+                var keyid = "<%=keyidstr %>";
+                if (keyid != "") {
+
+                } else {
+                    $(vv).change();
+                }
+            });
+
+            $("select[name='PSF_PressesDesk']").each(function (ii, vv) {
+                var keyid = "<%=keyidstr %>";
+                if (keyid != "") {
+                    var value_SelWaerId = $(this).attr("value_selspec");
+                    if ($(vv).val().indexOf('鍏紑') >= 0) {
+                         
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                    }
+                    else if ($(vv).val().indexOf('鍥涜壊') >= 0) {
+                        
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    }
+                    else if ($(vv).val().indexOf('鍏壊') >= 0) {
+                       
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    }
+                    else if ($(vv).val().indexOf('榛戠櫧') >= 0) {
+                       
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                       // $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
+                    }
+                    else if ($(vv).val().indexOf('杞浆') >= 0) {
+           
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                       // $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
+
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+
+
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                    }
+                    
+                    else if ($(vv).val().indexOf('鐩存帴淇垏') >= 0 || $(vv).val().indexOf('鏁扮爜') >= 0 || $(this).val().indexOf('琛ュ崟') >= 0 ) {
+
+ 
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    }
+
+
+                    else if ($(vv).val().indexOf('涓庡叾浠栬鍗曞悎鐗�') >= 0 ) {
+
+
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+                        $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+                        $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                        $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    }
+
+
+                    if ($(vv).val().indexOf('杞浆') >= 0) {
+                        var selectElement = $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']");
+                        var sssssss = selectElement.val();
+
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectElement.empty();
+
+                        const newOptions = [
+                            { value: '鎵g増', text: '鎵g増' },
+                            { value: '鍗曢潰', text: '鍗曢潰' }
+
+                        ];
+
+
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml = '';
+                        newOptions.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectElement.html(optionHtml); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+
+                        selectElement.val(sssssss);
+
+                        $("p[name='PSF_Zhizhangshuliang'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_Kailiaoguige'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_Zhizhangshulianga'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_Yinshuazhengshu'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_Xiaohao'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_Kuandu'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_LastNum'][value_lastnumid='" + value_SelWaerId + "']").hide();
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+                    }
+                    else {
+                        var selectElement = $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']")
+                        var sssssss =  selectElement.val();
+
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectElement.empty();
+
+                        const newOptions = [
+                            { value: '鑷炕', text: '鑷炕' },
+                            { value: '婊氱炕', text: '婊氱炕' },
+                            { value: '鎵g増', text: '鎵g増' },
+                            { value: '鍗曢潰', text: '鍗曢潰' }
+
+                        ];
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml = '';
+                        newOptions.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectElement.html(optionHtml); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+                        selectElement.val(sssssss);
+
+                        $("p[name='PSF_Zhizhangshuliang'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_Kailiaoguige'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_Zhizhangshulianga'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_Yinshuazhengshu'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_Xiaohao'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_Kuandu'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+                        $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_PrintedPositive'][value_positiveid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_LastNum'][value_lastnumid='" + value_SelWaerId + "']").show();
+                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+                        $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+                        if ($(this).val().indexOf('榛戠櫧') >= 0) {
+                            $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+                        }
+                    }
+                    
+
+
+                    if ($(vv).val().indexOf('灏忔.') >= 0) {
+                        var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
+                        var sssssss = selectPSF_PrintedColorPositive.val();
+
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectPSF_PrintedColorPositive.empty();
+
+                        const newOptions1 = [
+                            { value: '鍗曡壊', text: '鍗曡壊' },
+                            { value: '鍙岃壊', text: '鍙岃壊' },
+                            { value: '涓夎壊', text: '涓夎壊' },
+                            { value: '鍥涜壊', text: '鍥涜壊' },
+                        ];
+
+
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml1 = '';
+                        newOptions1.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectPSF_PrintedColorPositive.html(optionHtml1); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+                        selectPSF_PrintedColorPositive.val(sssssss);
+
+                        var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
+                        var ssssssss = selectPSF_PrintedColorRear.val();
+
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectPSF_PrintedColorRear.empty();
+
+                        const newOptions2 = [
+                            { value: '0鑹�', text: '0鑹�' },
+                            { value: '鍗曡壊', text: '鍗曡壊' },
+                            { value: '鍙岃壊', text: '鍙岃壊' },
+                            { value: '涓夎壊', text: '涓夎壊' },
+                            { value: '鍥涜壊', text: '鍥涜壊' },
+                        ];
+
+
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml2 = '';
+                        newOptions2.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectPSF_PrintedColorRear.html(optionHtml2); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+                        selectPSF_PrintedColorRear.val(ssssssss);
+                    } else {
+                        var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
+
+                        var sssssss = selectPSF_PrintedColorPositive.val();
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectPSF_PrintedColorPositive.empty();
+
+                        const newOptions1 = [
+                            { value: '鍗曡壊', text: '鍗曡壊' },
+                            { value: '鍙岃壊', text: '鍙岃壊' },
+                            { value: '涓夎壊', text: '涓夎壊' },
+                            { value: '鍥涜壊', text: '鍥涜壊' },
+                            { value: '鍥�+涓�', text: '鍥�+涓�' },
+                        ];
+
+
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml1 = '';
+                        newOptions1.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectPSF_PrintedColorPositive.html(optionHtml1); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+
+                        selectPSF_PrintedColorPositive.val(sssssss);
+
+                        var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
+                        var ssssssss = selectPSF_PrintedColorRear.val();
+
+                        // 娓呯┖鐜版湁鐨刼ption
+                        selectPSF_PrintedColorRear.empty();
+
+                        const newOptions2 = [
+                            { value: '0鑹�', text: '0鑹�' },
+                            { value: '鍗曡壊', text: '鍗曡壊' },
+                            { value: '鍙岃壊', text: '鍙岃壊' },
+                            { value: '涓夎壊', text: '涓夎壊' },
+                            { value: '鍥涜壊', text: '鍥涜壊' },
+                            { value: '鍥�+涓�', text: '鍥�+涓�' },
+                        ];
+
+
+
+                        // 3. 鎵归噺鏂板option鍒皊elect涓�
+                        let optionHtml2 = '';
+                        newOptions2.forEach(item => {
+                            // 鎷兼帴option鏍囩锛岀洿鎺ヨ祴鍊煎嵆鍙�
+                            optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
+                        });
+                        selectPSF_PrintedColorRear.html(optionHtml2); // 璧嬪�煎埌select锛屽畬鎴愭柊澧�
+                        selectPSF_PrintedColorRear.val(ssssssss);
+                    }
+
+                 } 
+             });
+
+
+           
+            $("input[name='CTPSpecName']").each(function (ii, vv) {
+                var keyid = "<%=keyidstr %>";
+               
+                 if (keyid != "") {
+
+                 } else {
+                     $(vv).val("395*460");
+                    
+                }
+            });
+           
+
+           
+            $(function () {
+
+                $(".FromWarehouse").click(function () {
+                    value_WaerId = $(this).attr("value_waerid");
+                    var value_pparid = "1";
+                    top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=绾稿紶&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+                });
+                $(".FromWarehouseByBanCai").click(function () {
+                    value_WaerId = $(this).attr("value_waerid");
+                    var value_pparid = "2";
+                    top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=鐗堟潗&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+                });
+                $(".FromWarehouseByBanCai1").click(function () {
+                    value_WaerId = $(this).attr("value_waerid");
+                    var value_pparid = "3";
+                    top.Dialog.open({ URL: "/Pages/business/AgConWarehouse.aspx?CommidityType=鐗堟潗&&value_pparid=" + value_pparid, Width: 1000, Height: 650, Title: "閫夋嫨璐у搧鍙傛暟" });
+                });
+
+
+                
+            });
+
+
+            $(".xialap").hover(function () {
+                $(this).find(".xialapb").show();
+            }, function () {
+                $(this).find(".xialapb").hide();
+            });
+
+            $(".xialapr").hover(function () {
+                $(this).find(".xialapb").show();
+                $(this).removeClass("xialapr").addClass("xialaprh");
+            }, function () {
+                $(this).removeClass("xialaprh").addClass("xialapr");
+                $(this).find(".xialapb").hide();
+            });
+
+            $(".xialapr").click(function () {
+                $(this).parent().parent().find("input").val($(this).text());
+                $(".xialapb").hide();
+            });
+
+
+
+
+
+            $(".xialapp").hover(function () {
+                $(this).find(".xialapbp").show();
+            }, function () {
+                $(this).find(".xialapbp").hide();
+            });
+
+            $(".xialaprp").hover(function () {
+                $(this).find(".xialapbp").show();
+                $(this).removeClass("xialaprp").addClass("xialaprhp");
+            }, function () {
+                $(this).removeClass("xialaprhp").addClass("xialaprp");
+                $(this).find(".xialapbp").hide();
+            });
+
+            $(".xialaprp").click(function () {
+                $(this).parent().parent().find("input").val($(this).text());
+                $(".xialapbp").hide();
+            });
+
         });
 
+         function CorrectText() {
+             $("select").each(function (ii, vv) {
+                 $(vv).val($(vv).val().replace(",", "锛�+-+锛�"));
+             });
+             $("input").each(function (ii, vv) {
+                 $(vv).val($(vv).val().replace(",", "锛�+-+锛�"));
+             });
+             $("textarea").each(function (ii, vv) {
+                 $(vv).val($(vv).val().replace(",", "锛�+-+锛�"));
+             });
+         }
 
-        //绾稿紶閲囪喘
+         function GetGoodsData(value_pparid, goodsName, SpecificationName, InventoryCounttext, Keyid, papernum1) {
+             if (value_pparid == "1") {
+                 $("input[name='PSF_PaperName'][value_ppwaerid='" + value_WaerId + "']").val(goodsName);
+                 $("input[name='PSF_MaterialSpecifications'][value_ppwaerid='" + value_WaerId + "']").val(SpecificationName);
+                 $("input[name='PSF_PrintedCount'][value_ppwaerid='" + value_WaerId + "']").val(InventoryCounttext);
+                 $("input[name='PSF_PaperId'][value_ppwaerid='" + value_WaerId + "']").val(Keyid);
+                 $("input[name='PMS_PaperCount1'][value_ppwaerid='" + value_WaerId + "']").val(papernum1);
+             }
+             else if (value_pparid == "2") {
+                 $("input[name='CTPSpecName'][value_ppwaerid='" + value_WaerId + "']").val(SpecificationName);
+                 $("input[name='CTPCount'][value_ppwaerid='" + value_WaerId + "']").val(InventoryCounttext);
+                 //alert(InventoryCounttext);
+                 $("input[name='PSF_PaperId2'][value_ppwaerid='" + value_WaerId + "']").val(Keyid);
+             }
+             else if (value_pparid == "3") {
+
+                 $("input[name='PSF_PSBan'][value_ppwaerid='" + value_WaerId + "']").val(SpecificationName);
+                 $("input[name='PSCount'][value_ppwaerid='" + value_WaerId + "']").val(InventoryCounttext);
+                 $("input[name='PSF_PaperId3'][value_ppwaerid='" + value_WaerId + "']").val(Keyid);
+             }
+
+         }
+     //绾稿紶閲囪喘
         function zhizhangcaigou() {
-
+             
             top.Dialog.open({ URL: "/Pages/procurement/ProcurementADD.aspx", Title: "绾稿紶閲囪喘", Width: 1100, Height: 700 });
-
+            
         }
-    </script>
+     </script>
 </body>
 </html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 773b3ad..91f3ea4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -27,7 +27,24 @@
         OA_InventoryBLL bll_OA_InventoryBLL = null;
         OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
         public Guid targetid = Guid.Empty;
+
+ 
+ 
+ 
+        EC_CuttingPaperSpecBLL bll_EC_CuttingPaperSpecBLL = null;
+        public string PressesDeskHtml = "";
+        public string SpecificationsSheetHtml = "";
+        public string selFilmSpecHtml = "";
+        public string selCTPSpecHtml = "";
+        public string SelPaperSpecHtml = "";
+        public string selPaperNameHtml = "";
+        public string selCuttingPaperSpecHtml = "";
+        public string keyidstr = "";
+        public string printCount = "";
+        public string[] Width = new string[7];
+        public string[] Lenth = new string[7];
         public string xialapr = "";
+
 
         //鍒濆鍖�
         public AgMergerOrderEdit()
@@ -39,6 +56,7 @@
 
             bll_OA_InventoryBLL = new OA_InventoryBLL();
             bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
         }
 
         //椤甸潰鍔犺浇
@@ -59,55 +77,86 @@
             this.selExigencyDegree.DataBind();
             this.selExigencyDegree.Value = "0";
 
-            this.selPMS_Machine.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鍗板埛鏈哄彴");
-            this.selPMS_Machine.DataValueField = "ParName";
-            this.selPMS_Machine.DataTextField = "ParName";
-            this.selPMS_Machine.DataBind();
-            this.selPMS_Machine.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鍗板埛鏈哄彴") as List<EC_MemberDictionary>;
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList_o = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鏉挎潗瑙勬牸") as List<EC_MemberDictionary>;
 
-            this.selPaperName.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫绾稿悕绉�");
-            this.selPaperName.DataValueField = "Keyid";
-            this.selPaperName.DataTextField = "ParName";
-            this.selPaperName.DataBind();
-            this.selPaperName.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-            //this.selPaperName.Visible = false;
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList_paperName = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫绾稿悕绉�") as List<EC_MemberDictionary>;
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList_paperSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫绾歌鏍�") as List<EC_MemberDictionary>;
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList_filmSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫鑿叉灄瑙勬牸") as List<EC_MemberDictionary>;
+            List<EC_MemberDictionary> m_EC_MemberDictionaryList_ctpSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫CTP瑙勬牸") as List<EC_MemberDictionary>;
 
-            this.SelPaperSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫绾歌鏍�");
-            this.SelPaperSpec.DataValueField = "Keyid";
-            this.SelPaperSpec.DataTextField = "ParName";
-            this.SelPaperSpec.DataBind();
-            this.SelPaperSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-            // this.SelPaperSpec.Visible = false;
+            Pagination pa = new Pagination();
+            pa.PageSize = 15;
+            pa.PageIndex = 1;
+            List<EC_CuttingPaperSpec> m_EC_CuttingPaperSpec = bll_EC_CuttingPaperSpecBLL.SelectModelPage(pa, CurrentUser.MemberId) as List<EC_CuttingPaperSpec>;
 
-            this.selCTPSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫CTP瑙勬牸");
-            this.selCTPSpec.DataValueField = "Keyid";
-            this.selCTPSpec.DataTextField = "ParName";
-            this.selCTPSpec.DataBind();
-            this.selCTPSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-            //this.selCTPSpec.Visible = false;
 
-            this.selFilmSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫鑿叉灄瑙勬牸");
-            this.selFilmSpec.DataValueField = "Keyid";
-            this.selFilmSpec.DataTextField = "ParName";
-            this.selFilmSpec.DataBind();
-            this.selFilmSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-            //this.selFilmSpec.Visible = false;
 
-            //this.PlateSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
-            //this.PlateSpec.DataValueField = "ParName";
-            //this.PlateSpec.DataTextField = "ParName";
-            //this.PlateSpec.DataBind();
-            //this.PlateSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+            if (m_EC_MemberDictionaryList != null && m_EC_MemberDictionaryList.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList)
+                {
+                    PressesDeskHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
+            }
             var sss = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
             foreach (var eC_MemberDictionary in sss)
             {
-                xialapr += " <div class=\"xialapr\">"+ eC_MemberDictionary.ParName + "</div>";
-                
+                xialapr += " <div class=\"xialaprp\">" + eC_MemberDictionary.ParName + "</div>";
+
+            }
+            if (m_EC_MemberDictionaryList_o != null && m_EC_MemberDictionaryList_o.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList_o)
+                {
+                    SpecificationsSheetHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
             }
 
-           
+            if (m_EC_MemberDictionaryList_paperName != null && m_EC_MemberDictionaryList_paperName.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList_paperName)
+                {
+                    selPaperNameHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
+            }
 
-            Pagination pa = new Pagination();
+            if (m_EC_MemberDictionaryList_paperSpec != null && m_EC_MemberDictionaryList_paperSpec.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList_paperSpec)
+                {
+                    SelPaperSpecHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
+            }
+
+            if (m_EC_MemberDictionaryList_filmSpec != null && m_EC_MemberDictionaryList_filmSpec.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList_filmSpec)
+                {
+                    selFilmSpecHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
+            }
+
+            if (m_EC_MemberDictionaryList_ctpSpec != null && m_EC_MemberDictionaryList_ctpSpec.Count > 0)
+            {
+                foreach (var item in m_EC_MemberDictionaryList_ctpSpec)
+                {
+                    selCTPSpecHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
+                }
+            }
+
+            if (m_EC_CuttingPaperSpec != null && m_EC_CuttingPaperSpec.Count > 0)
+            {
+                foreach (var item in m_EC_CuttingPaperSpec)
+                {
+                    selCuttingPaperSpecHtml += "<option value='" + item.SpecName + "'>" + item.SpecName + "</option>";
+                }
+            }
+
+
+
+
+            pa = new Pagination();
             pa.PageSize = 500;
             pa.PageIndex = 1;
             this.selOutFirm.DataSource = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
@@ -134,6 +183,7 @@
                 strOrderId = strOrderIdTemp.Replace("<br/>", ",");
                 orderId = strOrderId.Trim(',').Split(',');
             }
+            keyidstr = m_EC_MergerSingle.Keyid.ToString2();
             EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
 
             List<EC_OrderBasic> mEC_OrderBasicList = new List<EC_OrderBasic>();
@@ -206,7 +256,7 @@
             this.spanSpecialNum.InnerText = string.IsNullOrEmpty(m_EC_MergerSingle.PMS_OrderNum) ? bll_EC_MergerSingleBLL.GetPMS_OrderNum(CurrentUser.MemberId) : m_EC_MergerSingle.PMS_OrderNum;
             this.spanSpecialTime.InnerText = m_EC_MergerSingle.PMS_OrderTime == null ? DateTime.Now.ToString("yyyy-MM-dd HH:mm") : m_EC_MergerSingle.PMS_OrderTime.Value.ToString("yyyy-MM-dd HH:mm");
             this.spanSpecialOprator.InnerText = string.IsNullOrEmpty(m_EC_MergerSingle.Operator) ? CurrentUser.ShortName : m_EC_MergerSingle.Operator;
-            this.PMS_CompletionTime.Value = m_EC_MergerSingle.PMS_CompletionTime == null ? DateTime.Now.ToString("yyyy-MM-dd HH:mm") : m_EC_MergerSingle.PMS_CompletionTime.Value.ToString("yyyy-MM-dd HH:mm");
+             
 
             if (m_EC_MergerSingle.Keyid != null)
             {
@@ -227,124 +277,7 @@
                 this.RepMergerEdit.DataSource = m_EC_MergerOrdersList;
                 this.RepMergerEdit.DataBind();
 
-                this.PMS_PaperSource.Value = m_EC_MergerSingle.PMS_PaperSource;
-                if (this.PMS_PaperSource.Value == "鏉ヨ嚜浠撳簱")
-                {
-
-                    //this.PMS_PaperName.Visible = true;
-                    this.PMS_PaperName.Style.Add("display", "true");
-                    //this.PMS_PaperSpecification.Visible = true;
-                    this.PMS_PaperSpecification.Style.Add("display", "true");
-
-                    //this.selPaperName.Visible = false;
-                    this.selPaperName.Style.Add("display", "none");
-
-                    //this.SelPaperSpec.Visible = false;
-
-                    this.selPaperName.Style.Add("display", "none");
-
-                    this.PMS_PaperName.Value = m_EC_MergerSingle.PMS_PaperName;
-                    this.PMS_PaperSpecification.Value = m_EC_MergerSingle.PMS_PaperSpecification;
-                }
-                else
-                {
-
-                    //this.PMS_PaperName.Visible = false;
-                    this.PMS_PaperName.Style.Add("display", "none");
-                    //this.PMS_PaperSpecification.Visible = false;
-                    this.PMS_PaperSpecification.Style.Add("display", "none");
-
-                    this.selPaperName.Style.Add("display", "block");
-                    this.SelPaperSpec.Style.Add("display", "block");
-                    this.selPaperName.Value = m_EC_MergerSingle.PMS_PaperNameType.ToString2();
-                    this.SelPaperSpec.Value = m_EC_MergerSingle.PMS_PaperSpecType.ToString2();
-                }
-                this.PMS_PaperCount.Value = m_EC_MergerSingle.PMS_PaperCount.ToString2();
-                this.PMS_PaperPositive.Value = m_EC_MergerSingle.PMS_PaperPositive.ToString2();
-                this.PMS_PaperConsume.Value = m_EC_MergerSingle.PMS_PaperConsume.ToString2();
-
-                this.selPMS_Machine.Value = m_EC_MergerSingle.PMS_Machine.ToString2();
-                this.PSF_Typesetting.Value = m_EC_MergerSingle.PMS_Mode;
-                this.PMS_IsRevisedEdition.Value = m_EC_MergerSingle.PMS_IsRevisedEdition ? "淇増" : "涓嶄慨鐗�";
-                this.PMS_IsColorSamples.Value = m_EC_MergerSingle.PMS_IsColorSamples.ToString2();
-                this.PMS_ChromaticNumber.Value = m_EC_MergerSingle.PMS_ChromaticNumber.ToString2();
-
-
-                this.selPlateType.Value = m_EC_MergerSingle.PMS_PlateSource.ToString2();
-                if (selPlateType.Value == "1")
-                {
-
-                    //this.PlateSpec.Visible = true;
-                    this.PlateSpec.Style.Add("display", "table-cell");
-                    //this.lbCTPCount.Visible = true;
-                    this.lbCTPCount.Style.Add("display", "table-cell");
-                    //this.tdCTPCount.Visible = true;
-                    this.tdCTPCount.Style.Add("display", "table-cell");
-
-                    //this.selCTPSpec.Visible = false;
-                    this.selCTPSpec.Style.Add("display", "none");
-                    //this.selFilmSpec.Visible = false;
-                    this.selFilmSpec.Style.Add("display", "none");
-                    //this.lbPSSpec.Visible = false;
-                    this.lbPSSpec.Style.Add("display", "none");
-                    //this.tdPSSpec.Visible = false;
-                    this.tdPSSpec.Style.Add("display", "none");
-                    //this.lbPSCount.Visible = false;
-                    this.lbPSCount.Style.Add("display", "none");
-                    //this.tdPsCount.Visible = false;
-                    this.tdPsCount.Style.Add("display", "none");
-                    this.PlateSpec.Value = m_EC_MergerSingle.PMS_CTP.ToString2();
-                    this.CTPCount.Value = m_EC_MergerSingle.PMS_CTPCount.ToString2();
-                }
-                else if (selPlateType.Value == "0")
-                {
-
-                    //this.PlateSpec.Visible = false;
-                    this.PlateSpec.Style.Add("display", "none");
-                    //this.lbCTPCount.Visible = false;
-                    this.lbCTPCount.Style.Add("display", "none");
-                    //this.tdCTPCount.Visible = false;
-                    this.tdCTPCount.Style.Add("display", "none");
-                    this.selCTPSpec.Style.Add("display", "table-cell");
-                    //this.selFilmSpec.Visible = false;
-                    this.selFilmSpec.Style.Add("display", "none");
-                    //this.lbPSSpec.Visible = false;
-                    this.lbPSSpec.Style.Add("display", "none");
-                    //this.tdPSSpec.Visible = false;
-                    this.tdPSSpec.Style.Add("display", "none");
-                    //this.lbPSCount.Visible = false;
-                    this.lbPSCount.Style.Add("display", "none");
-                    //this.tdPsCount.Visible = false;
-                    this.tdPsCount.Style.Add("display", "none");
-                    this.selCTPSpec.Value = m_EC_MergerSingle.PMS_CTPSpecType.ToString2();
-                }
-                else
-                {
-
-                    //this.PlateSpec.Visible = false;
-                    this.PlateSpec.Style.Add("display", "none");
-                    //this.lbCTPCount.Visible = false;
-                    this.lbCTPCount.Style.Add("display", "none");
-                    ////this.tdCTPCount.Visible = false;
-                    this.tdCTPCount.Style.Add("display", "none");
-                    //this.selCTPSpec.Visible = false;
-                    this.selCTPSpec.Style.Add("display", "none");
-                    this.selFilmSpec.Style.Add("display", "table-cell");
-                    //this.lbPSSpec.Visible = true;
-                    this.lbPSSpec.Style.Add("display", "table-cell");
-                    //this.tdPSSpec.Visible = true;
-                    this.tdPSSpec.Style.Add("display", "table-cell");
-                    //this.lbPSCount.Visible = true;
-                    this.lbPSCount.Style.Add("display", "table-cell");
-                    //this.tdPsCount.Visible = true;
-                    this.tdPsCount.Style.Add("display", "table-cell");
-                    this.selFilmSpec.Value = m_EC_MergerSingle.PMS_FilmType.ToString2();
-                    this.PMS_PSBan.Value = m_EC_MergerSingle.PMS_PSBan.ToString2();
-                    this.PSCount.Value = m_EC_MergerSingle.PMS_PSCount.ToString2();
-                }
-
-                this.PMS_CompletionTime.Value = m_EC_MergerSingle.PMS_CompletionTime.ToStringForDateTime("yyyy-MM-dd");
-                this.PMS_TotalPrice.Value = (m_EC_MergerSingle.PMS_TotalPrice ?? 0).ToString("0.00");
+               
                 this.PMS_Remarks.Value = m_EC_MergerSingle.PMS_Remarks.ToString2();
 
 
@@ -357,6 +290,108 @@
                 this.RepClientList.DataBind();
                 this.selOutFirm.Value = "-1";
             }
+
+
+            List<EC_MergerForums> m_EC_MergerForumsList = bll_EC_MergerSingleBLL.GetEC_MergerForumsListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerForums>;
+            if (m_EC_MergerForumsList == null || m_EC_MergerForumsList.Count == 0)
+            {
+                m_EC_MergerForumsList = new List<EC_MergerForums>();
+                EC_MergerForums m_EC_MergerForums = new EC_MergerForums();
+                //m_EC_MergerForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand;
+                m_EC_MergerForums.PSF_Forumsid = 1;
+                m_EC_MergerForums.PSF_CTPCount = 1;
+                m_EC_MergerForumsList.Add(m_EC_MergerForums);
+            }
+            this.Repeater1.DataSource = m_EC_MergerForumsList;
+            this.Repeater1.DataBind();
+
+            //鑾峰彇寮�鏂欏昂瀵�
+            EC_CuttingPaperSpec model = new EC_CuttingPaperSpec();
+            //model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "灏忓叏寮�");
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "灏忓叏寮�");
+            if (model != null)
+            {
+                Width[0] = model.Width;
+                Lenth[0] = model.Length;
+            }
+            else
+            {
+                Width[0] = "";
+                Lenth[0] = "";
+            }
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "2寮�");
+
+            if (model != null)
+            {
+                Width[1] = model.Width;
+                Lenth[1] = model.Length;
+            }
+            else
+            {
+                Width[1] = "";
+                Lenth[1] = "";
+            }
+
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "3寮�");
+            if (model != null)
+            {
+                Width[2] = model.Width;
+                Lenth[2] = model.Length;
+            }
+            else
+            {
+                Width[2] = "";
+                Lenth[2] = "";
+            }
+
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "4寮�");
+            if (model != null)
+            {
+                Width[3] = model.Width;
+                Lenth[3] = model.Length;
+            }
+            else
+            {
+                Width[3] = "";
+                Lenth[3] = "";
+            }
+
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "6寮�");
+            if (model != null)
+            {
+                Width[4] = model.Width;
+                Lenth[4] = model.Length;
+            }
+            else
+            {
+                Width[4] = "";
+                Lenth[4] = "";
+            }
+
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "8寮�");
+            if (model != null)
+            {
+                Width[5] = model.Width;
+                Lenth[5] = model.Length;
+            }
+            else
+            {
+                Width[5] = "";
+                Lenth[5] = "";
+            }
+
+            model = bll_EC_CuttingPaperSpecBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鍏跺畠");
+            if (model != null)
+            {
+                Width[6] = model.Width;
+                Lenth[6] = model.Length;
+            }
+            else
+            {
+                Width[6] = "";
+                Lenth[6] = "";
+            }
+
             return true;
         }
 
@@ -367,8 +402,59 @@
             {
                 #region 鑾峰彇鍊煎苟鍒ゆ柇鍊兼槸鍚︽纭�
 
-                //int? keyid = Request["keyid"].ToInt32();
-                //string[] orderId = Request["txtOrderId"].ToString2().Trim(',').Split(',');
+
+                string[] PSF_Forumsid = Request["PSF_Forumsid"].ToString2().Split(',');
+
+                if (PSF_Forumsid.Length == 0)
+                {
+                    JavaScript.MessageBox("鎻愪氦澶辫触", this);
+                    return;
+                }
+
+                string[] PSF_Component = Request["PSF_Component"].ToString2().Split(',');
+                string[] PSF_Chengpinchicun = Request["PSF_Chengpinchicun"].ToString2().Split(',');
+                string[] PSF_PNum = Request["PSF_PNum"].ToString2().Split(',');
+                string[] PSF_PressesDesk = Request["PSF_PressesDesk"].ToString2().Split(',');
+                string[] PSF_PrintedColorPositive = Request["PSF_PrintedColorPositive"].ToString2().Split(',');
+                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_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
+                string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
+                string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
+                string[] PSF_PaperSource = Request["PSF_PaperSource"].ToString2().Split(',');
+                string[] PSF_PaperId = Request["PSF_PaperId"].ToString2().Split(',');
+                string[] PMS_PaperCount1 = Request["PMS_PaperCount1"].ToString2().Split(',');
+                string[] PSF_CTPId = Request["PSF_PaperId2"].ToString2().Split(',');
+                string[] PSF_PSId = Request["PSF_PaperId3"].ToString2().Split(',');
+                string[] PSF_PaperName = Request["PSF_PaperName"].ToString2().Split(',');
+                string[] selPaperName = Request["selPaperName"].ToString2().Split(',');
+                string[] PSF_MaterialSpecifications = Request["PSF_MaterialSpecifications"].ToString2().Split(',');
+                string[] SelPaperSpec = Request["SelPaperSpec"].ToString2().Split(',');
+
+                string[] PSF_BigPaperCount = Request["PSF_BigPaperCount"].ToString2().Split(',');
+                string[] PSF_OpenSpecifications = Request["PSF_OpenSpecifications"].ToString2().Split(',');
+                string[] PSF_Qitadingdanhao = Request["PSF_Qitadingdanhao"].ToString2().Split(',');
+                string[] PSF_OpenWidth = Request["PSF_OpenWidth"].ToString2().Split(',');
+                string[] PSF_OpenWidthName = Request["PSF_OpenWidthName"].ToString2().Split(',');
+                string[] PSF_OpenLength = Request["PSF_OpenLength"].ToString2().Split(',');
+
+                string[] selPlateType = Request["selPlateType"].ToString2().Split(',');
+                string[] CTPSpecName = Request["CTPSpecName"].ToString2().Split(',');
+                string[] selCTPSpec = Request["selCTPSpec"].ToString2().Split(',');
+                string[] selFilmSpec = Request["selFilmSpec"].ToString2().Split(',');
+                string[] CTPCount = Request["CTPCount"].ToString2().Split(',');
+                string[] PSF_PSBan = Request["PSF_PSBan"].ToString2().Split(',');
+                string[] PSCount = Request["PSCount"].ToString2().Split(',');
+
+                string[] PSF_Note = Request["PSF_Note"].ToString2().Split(',');
+                string PSO_Work = Request["PSO_Work"].ToString2();
+                string PSO_Remarks = Request["PSO_Remarks"].ToString2();
+
+                string[] oldPSF_PaperId = Request["oldPSF_PaperId"].ToString2().Split(',');
+                string[] oldPSF_BigPaperCount = Request["oldPSF_BigPaperCount"].ToString2().Split(',');
+
+
 
                 int? keyid = Request["keyid"].ToInt32();
                 string[] orderId = new string[100];
@@ -405,10 +491,7 @@
                 string[] PO_Title = Request["txtDocumentName"].ToString2().Split(',');
                 string[] PO_Size = Request["PrintSizeName"].ToString2().Split(',');
 
-                string[] PSF_PaperId = new string[3];
-                PSF_PaperId[0] = Request["PSF_PaperId1"].ToString2().Trim('|');
-                PSF_PaperId[1] = Request["PSF_PaperId2"].ToString2().Trim(',');
-                PSF_PaperId[2] = Request["PSF_PaperId3"].ToString2().Trim(',');
+              
 
                 if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length || orderId.Length != PO_PackagRequire.Length || orderId.Length != PO_Requirement.Length)
                 {
@@ -420,16 +503,14 @@
 
                 EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
 
-                //EC_MergerSingle m_EC_MergerSingle = bll_EC_MergerSingleBLL.GetModelByKeyid(keyid);
-                //if (m_EC_MergerSingle == null || m_EC_MergerSingle.Keyid == null)
-                //    m_EC_MergerSingle = new EC_MergerSingle();
+               
 
                 //鏂藉伐鍗曞彿
                 string num = string.IsNullOrEmpty(m_EC_MergerSingle.PMS_OrderNum) ? bll_EC_MergerSingleBLL.GetPMS_OrderNum(CurrentUser.MemberId) : m_EC_MergerSingle.PMS_OrderNum;
 
                 List<EC_MergerOrders> m_EC_MergerOrdersList = new List<EC_MergerOrders>();
                 List<EC_OrderOperate> m_EC_OrderOperateList = new List<EC_OrderOperate>();
-                List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
+               // List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
                 List<OA_OrderWorkListRelation> m_OA_OrderWorkListRelationList = new List<OA_OrderWorkListRelation>();
                 EC_OrderBasic m_EC_OrderBasicNew = new EC_OrderBasic();
                 EC_AcceptWayByOrder m_EC_AcceptWayByOrder = new EC_AcceptWayByOrder();
@@ -466,89 +547,7 @@
                     m_OA_OrderWorkListRelationList.Add(m_OA_OrderWorkListRelation);
 
                 }
-                if (m_EC_MergerSingle.Keyid == null)
-                {
-                    for (int i = 0; i < PSF_PaperId.Length; i++)
-                    {
-                        PSF_PaperId[i] = PSF_PaperId[i].Trim('|');
-                        if (i == 0)
-                        {
-                            if (!string.IsNullOrEmpty(PSF_PaperId[i].Trim('|')))
-                            {
-                                string[] PSF_PaperId_NEW = PSF_PaperId[i].Trim('|').Split('|');
-                                string[] PMS_PaperCount1 = Request["PMS_PaperCount1"].ToString2().Trim('|').Split('|');
-
-                                foreach (var item in PSF_PaperId_NEW)
-                                {
-                                    if (item.ToInt32() > 0)
-                                    {
-                                        OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.GetModelByKeyid(item.ToInt32());
-                                        if (m_OA_InventoryOld != null && m_OA_InventoryOld.FirmId == CurrentUser.MemberId)
-                                        {
-                                            OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
-                                            m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
-                                            m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
-                                            m_OA_OutOfStorageOld.CargoSpaceId = 0;
-                                            m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
-                                            m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
-                                            m_OA_OutOfStorageOld.SuppliersId = 0;
-                                            m_OA_OutOfStorageOld.Price = 0;
-                                            m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
-                                            m_OA_OutOfStorageOld.AllMoney = 0;
-                                            m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
-                                            m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
-                                            m_OA_OutOfStorageOld.Remark = "";
-                                            m_OA_OutOfStorageOld.TanPrice = 0;
-                                            m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
-                                            m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
-                                            m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
-                                            m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (PSF_PaperId[i].ToInt32() > 0)
-                            {
-                                OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.GetModelByKeyid(PSF_PaperId[i].ToInt32());
-                                if (m_OA_InventoryOld != null && m_OA_InventoryOld.FirmId == CurrentUser.MemberId)
-                                {
-                                    OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
-                                    m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
-                                    m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
-                                    m_OA_OutOfStorageOld.CargoSpaceId = 0;
-                                    m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
-                                    m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
-                                    m_OA_OutOfStorageOld.SuppliersId = 0;
-                                    m_OA_OutOfStorageOld.Price = 0;
-                                    if (i == 0)
-                                    {
-                                        m_OA_OutOfStorageOld.Quantity = Request["PMS_PaperCount"].ToInt32();
-                                    }
-                                    else if (i == 1)
-                                    {
-                                        m_OA_OutOfStorageOld.Quantity = Request["CTPCount"].ToInt32();
-                                    }
-                                    else if (i == 3)
-                                    {
-                                        m_OA_OutOfStorageOld.Quantity = Request["PSCount"].ToInt32();
-                                    }
-                                    m_OA_OutOfStorageOld.AllMoney = 0;
-                                    m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
-                                    m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
-                                    m_OA_OutOfStorageOld.Remark = "";
-                                    m_OA_OutOfStorageOld.TanPrice = 0;
-                                    m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
-                                    m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
-                                    m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
-                                    m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
-                                }
-                            }
-                        }
-                    }
-                }
+                
                 m_EC_MergerSingle.PMS_PaperName = Request["PMS_PaperName"].ToString2();
                 m_EC_MergerSingle.PMS_PaperSpecification = Request["PMS_PaperSpecification"].ToString2();
                 if (Request["PMS_PaperCount"].ToInt32() == null)
@@ -591,9 +590,9 @@
                 {
                     m_EC_MergerSingle.PMS_CompletionTime = Request["PMS_CompletionTime"].ToDateTime2();
                 }
-                m_EC_MergerSingle.PMS_TotalPrice = Request["PMS_TotalPrice"].ToDecimal2();
+                //m_EC_MergerSingle.PMS_TotalPrice = Request["PMS_TotalPrice"].ToDecimal2();
                 m_EC_MergerSingle.PMS_Remarks = Request["PMS_Remarks"].ToString2();
-                m_EC_MergerSingle.PMS_Collection = Request["PMS_TotalPrice"].ToDecimal2();
+                //m_EC_MergerSingle.PMS_Collection = Request["PMS_TotalPrice"].ToDecimal2();
                 m_EC_MergerSingle.PMS_Title = Request["txtDocumentName"].ToString2();
                 m_EC_MergerSingle.PMS_OldNum = Request["txtOrderNum"].ToString2();
                 m_EC_MergerSingle.PMS_OldId = Request["txtOrderId"].ToString2();
@@ -601,93 +600,12 @@
                 m_EC_MergerSingle.LastUpdateTime = DateTime.Now;
                 m_EC_MergerSingle.Operator = CurrentUser.ShortName;
 
-                if (Request["CTPCount"].ToInt32() == null)
-                {
-                    CTPCount.Value = "0";
-                }
+                m_EC_MergerSingle.PMS_PaperNameType = 0;
+                m_EC_MergerSingle.PMS_PaperSpecType = 0;
+                m_EC_MergerSingle.PMS_PaperNameTypeName = "";
+                m_EC_MergerSingle.PMS_PaperSpecTypeName = "";
 
-                //鑷甫绾稿紶鍜屾潵鑷粨搴撶殑涓嶅悓澶勭悊
-                m_EC_MergerSingle.PMS_PaperSource = Request["PMS_PaperSource"].ToString();
-                if (this.PMS_PaperSource.Value == "鏉ヨ嚜浠撳簱")
-                {
-                    m_EC_MergerSingle.PMS_PaperNameType = 0;
-                    m_EC_MergerSingle.PMS_PaperSpecType = 0;
-                    m_EC_MergerSingle.PMS_PaperNameTypeName = "";
-                    m_EC_MergerSingle.PMS_PaperSpecTypeName = "";
-                }
-                else
-                {
-                    if (this.selPaperName.Value != "")
-                    {
-                        m_EC_MergerSingle.PMS_PaperNameType = Convert.ToInt32(this.selPaperName.Value);
-                    }
-                    else
-                    {
-                        m_EC_MergerSingle.PMS_PaperNameType = 0;
-                    }
-                    if (this.SelPaperSpec.Value != "")
-                    {
-                        m_EC_MergerSingle.PMS_PaperSpecType = Convert.ToInt32(this.SelPaperSpec.Value);
-                    }
-                    else
-                    {
-                        m_EC_MergerSingle.PMS_PaperSpecType = 0;
-                    }
-                    m_EC_MergerSingle.PMS_PaperNameTypeName = selPaperName.Items[selPaperName.SelectedIndex].Text.ToString2();
-                    m_EC_MergerSingle.PMS_PaperSpecTypeName = SelPaperSpec.Items[SelPaperSpec.SelectedIndex].Text.ToString2();
-                }
-
-                //鐗堟潗涓嶅悓锛屽鐞嗕笉鍚�
-                m_EC_MergerSingle.PMS_PlateSource = Convert.ToInt32(this.selPlateType.Value);
-                m_EC_MergerSingle.PMS_PlateSourceName = selPlateType.Items[selPlateType.SelectedIndex].Text.ToString2();
-                if (this.selPlateType.Value == "1")
-                {
-                    m_EC_MergerSingle.PMS_CTPCount = CTPCount.Value.ToInt32();
-
-                    m_EC_MergerSingle.PMS_CTPSpecType = 0;
-                    m_EC_MergerSingle.PMS_CTPSpecTypeName = "";
-                    m_EC_MergerSingle.PMS_FilmType = 0;
-                    m_EC_MergerSingle.PMS_PSCount = 0;
-                    m_EC_MergerSingle.PMS_CTP = PlateSpec.Value;
-                    m_EC_MergerSingle.PMS_FilmTypeName = "";
-                }
-                else
-                {
-
-                    m_EC_MergerSingle.PMS_CTPCount = 0;
-
-                    if (this.selPlateType.Value == "0")
-                    {
-                        if (this.selCTPSpec.Value != "")
-                        {
-                            m_EC_MergerSingle.PMS_CTPSpecType = Convert.ToInt32(this.selCTPSpec.Value);
-                        }
-                        else
-                        {
-                            m_EC_MergerSingle.PMS_CTPSpecType = 0;
-                        }
-                        m_EC_MergerSingle.PMS_CTPSpecTypeName = selCTPSpec.Items[selCTPSpec.SelectedIndex].Text.ToString2();
-                        m_EC_MergerSingle.PMS_FilmType = 0;
-                        m_EC_MergerSingle.PMS_FilmTypeName = "";
-                        m_EC_MergerSingle.PMS_PSCount = 0;
-                    }
-                    else
-                    {
-                        m_EC_MergerSingle.PMS_CTPSpecType = 0;
-                        m_EC_MergerSingle.PMS_CTPSpecTypeName = "";
-                        if (this.selFilmSpec.Value != "")
-                        {
-                            m_EC_MergerSingle.PMS_FilmType = Convert.ToInt32(this.selFilmSpec.Value);
-                        }
-                        else
-                        {
-                            m_EC_MergerSingle.PMS_FilmType = 0;
-                        }
-                        m_EC_MergerSingle.PMS_FilmTypeName = selFilmSpec.Items[selFilmSpec.SelectedIndex].Text.ToString2();
-                        m_EC_MergerSingle.PMS_PSCount = Request["PSCount"].ToInt32();
-
-                    }
-                }
+              
 
                 OA_CorporateClients m_OA_CorporateClients_Out = new OA_CorporateClients();
                 if (IsOut && m_EC_MergerSingle.Keyid == null)
@@ -711,7 +629,7 @@
                     m_EC_OrderBasicNew.PrintTypeId = _eC_OrderBasic.PrintTypeId;
                     m_EC_OrderBasicNew.Remark = "";
                     m_EC_OrderBasicNew.SellerName = m_OA_CorporateClients_Out.OutVendorName;
-                    m_EC_OrderBasicNew.SumPrice = Request["PMS_TotalPrice"].ToDecimal2();
+                    m_EC_OrderBasicNew.SumPrice = 0;// Request["PMS_TotalPrice"].ToDecimal2();
                     m_EC_OrderBasicNew.UnitPrice = 0;
                     if (m_OA_CorporateClients_Out.Keyid != m_OA_CorporateClients_Out.FirmId)
                     {
@@ -760,9 +678,256 @@
                 }
 
 
+
+                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>();
+
+                for (int i = 0; i < PSF_Forumsid.Length; i++)
+                {
+                    EC_MergerForums m_EC_MergerForums = new EC_MergerForums();
+                    m_EC_MergerForums.PSF_Component = PSF_Component[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (PSF_PNum[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_PNum = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_PNum = PSF_PNum[i].ToInt32();
+                    }
+                    m_EC_MergerForums.PSF_PressesDesk = PSF_PressesDesk[i].ToString2().Replace("锛�+-+锛�", ",");
+                    m_EC_MergerForums.PSF_PrintedColorPositive = PSF_PrintedColorPositive[i].ToString2().Replace("锛�+-+锛�", ",");
+                    m_EC_MergerForums.PSF_PrintedColorRear = PSF_PrintedColorRear[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (PSF_PressesDesk[i].IndexOf("鏁扮爜") >= 0)
+                    {
+                        m_EC_MergerForums.PSF_Typesetting = PSF_Typesettinghide[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+
+
+                    if (PSF_PrintedCount[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_PrintedCount = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_PrintedCount = PSF_PrintedCount[i].ToInt32();
+                    }
+                    if (PSF_PrintedPositive[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_PrintedPositive = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_PrintedPositive = PSF_PrintedPositive[i].ToInt32();
+                    }
+                    if (PSF_LastNum[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_LastNum = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_LastNum = PSF_LastNum[i].ToInt32();
+                    }
+                    m_EC_MergerForums.PSF_PaperSource = PSF_PaperSource[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (m_EC_MergerForums.PSF_PaperSource == "鏉ヨ嚜浠撳簱")
+                    {
+                        m_EC_MergerForums.PSF_PaperName = PSF_PaperName[i].ToString2().Replace("锛�+-+锛�", ",");
+                        m_EC_MergerForums.PSF_MaterialSpecifications = PSF_MaterialSpecifications[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_PaperName = selPaperName[i].ToString2().Replace("锛�+-+锛�", ",");
+                        m_EC_MergerForums.PSF_MaterialSpecifications = SelPaperSpec[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+
+                    m_EC_MergerForums.PSF_Forumsid = PSF_Forumsid[i].ToInt32();
+                    //if (PSF_BigPaperCount[i].ToInt32() == null)
+                    //{
+                    //    m_EC_MergerForums.PSF_BigPaperCount = 0;
+                    //}
+                    //else
+                    //{
+                    //    m_EC_MergerForums.PSF_BigPaperCount = PSF_BigPaperCount[i].ToInt32();
+                    //}
+                    m_EC_MergerForums.PSF_BigPaperCount = 0;
+                    m_EC_MergerForums.PSF_OpenSpecifications = PSF_OpenSpecifications[i].ToString2().Replace("锛�+-+锛�", ",");
+
+                    if (PSF_PressesDesk[i].IndexOf("涓庡叾浠栬鍗曞悎鐗�") >= 0)
+                    {
+                        m_EC_MergerForums.PSF_PaperName = PSF_Qitadingdanhao[i];
+                    }
+                    if (PSF_PressesDesk[i].IndexOf("杞浆") >= 0 || PSF_PressesDesk[i].IndexOf("榛戠櫧") >= 0)
+                    {
+                        if (PSF_OpenWidthName[i].ToInt32() == null)
+                        {
+                            m_EC_MergerForums.PSF_OpenWidth = 0;
+                        }
+                        else
+                        {
+                            m_EC_MergerForums.PSF_OpenWidth = PSF_OpenWidthName[i].ToInt32();
+                        }
+
+                        if (PSF_PressesDesk[i].IndexOf("杞浆") >= 0)
+                        {
+                            m_EC_MergerForums.PSF_OpenWidth = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (PSF_OpenWidth[i].ToInt32() == null)
+                        {
+                            m_EC_MergerForums.PSF_OpenWidth = 0;
+                        }
+                        else
+                        {
+                            m_EC_MergerForums.PSF_OpenWidth = PSF_OpenWidth[i].ToInt32();
+                        }
+                    }
+
+
+                    if (PSF_OpenLength[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_OpenLength = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_OpenLength = PSF_OpenLength[i].ToInt32();
+                    }
+                    m_EC_MergerForums.PSF_PlateSource = selPlateType[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (m_EC_MergerForums.PSF_PlateSource == "鏈巶CTP")
+                    {
+                        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();
+                        }
+                    }
+                    else if (m_EC_MergerForums.PSF_PlateSource == "鑷甫CTP")
+                    {
+                        m_EC_MergerForums.PSF_CTPSpecType = selCTPSpec[i].ToString2().Replace("锛�+-+锛�", ",");
+                        m_EC_MergerForums.PSF_CTPCount = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_CTPSpecType = selFilmSpec[i].ToString2().Replace("锛�+-+锛�", ",");
+                        m_EC_MergerForums.PSF_CTPCount = 0;
+                    }
+                    m_EC_MergerForums.PSF_FilmType = "";
+                    m_EC_MergerForums.PSF_PSSpec = PSF_PSBan[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (PSCount[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_PSCount = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_PSCount = PSCount[i].ToInt32();
+                    }
+                    m_EC_MergerForums.PSF_Note = PSF_Note[i].ToString2().Replace("锛�+-+锛�", ",");
+                    m_EC_MergerForums.PSF_PaperId = 0;
+                    m_EC_MergerForumsList.Add(m_EC_MergerForums);
+
+                    //int? PaperId = PSF_PaperId[i].ToInt32();
+                    //int? CtpId = PSF_CTPId[i].ToInt32();
+                    //int? PSId = PSF_PSId[i].ToInt32();
+                    int? PaperCount = m_EC_MergerForums.PSF_PrintedCount ?? 0;
+                    int? iCTPCount = m_EC_MergerForums.PSF_CTPCount ?? 0;
+                    int? iPSCount = m_EC_MergerForums.PSF_PSCount ?? 0;
+
+                    //int? PaperCountOld = oldPSF_BigPaperCount[i].ToInt32() ?? 0;
+
+                    string[] PSF_PaperIdForStore = new string[3];
+                    PSF_PaperIdForStore[0] = PSF_PaperId[i].ToString2().Trim('|');
+                    PSF_PaperIdForStore[1] = PSF_CTPId[i].ToString2().Trim('|');
+                    PSF_PaperIdForStore[2] = PSF_PSId[i].ToString2().Trim('|');
+                    if (m_EC_MergerSingle.Keyid == null)
+                    {
+                        for (int j = 0; j < PSF_PaperIdForStore.Length; j++)
+                        {
+                            if (j == 0)
+                            {
+                                string[] PSF_PaperId_NEW = PSF_PaperIdForStore[0].Trim('|').Split('|');
+                                string[] PMS_PaperCount1_NEW = PMS_PaperCount1[i].ToString2().Trim('|').Split('|');
+
+                                foreach (var item in PSF_PaperId_NEW)
+                                {
+                                    OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.GetModelByKeyid(item.ToInt32());
+                                    if (m_OA_InventoryOld != null && m_OA_InventoryOld.FirmId == CurrentUser.MemberId)
+                                    {
+                                        OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
+                                        m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
+                                        m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
+                                        m_OA_OutOfStorageOld.CargoSpaceId = 0;
+                                        m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
+                                        m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
+                                        m_OA_OutOfStorageOld.SuppliersId = 0;
+                                        m_OA_OutOfStorageOld.Price = 0;
+                                        m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
+                                        m_OA_OutOfStorageOld.AllMoney = 0;
+                                        m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
+                                        m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
+                                        m_OA_OutOfStorageOld.Remark = "";
+                                        m_OA_OutOfStorageOld.TanPrice = 0;
+                                        m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
+                                        m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
+                                        m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+                                        m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                OA_Inventory m_OA_Inventory = bll_OA_InventoryBLL.GetModelByKeyid(PSF_PaperIdForStore[j].ToInt32());
+                                if (m_OA_Inventory != null && m_OA_Inventory.FirmId == CurrentUser.MemberId)
+                                {
+                                    OA_OutOfStorage m_OA_OutOfStorage = new OA_OutOfStorage();
+                                    m_OA_OutOfStorage.FirmId = CurrentUser.MemberId;
+                                    m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
+                                    m_OA_OutOfStorage.CargoSpaceId = 0;
+                                    m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
+                                    m_OA_OutOfStorage.InfoType = "纭鍑哄簱";
+                                    m_OA_OutOfStorage.SuppliersId = 0;
+                                    m_OA_OutOfStorage.Price = 0;
+                                    if (j == 0)
+                                    {
+                                        m_OA_OutOfStorage.Quantity = PaperCount;
+                                    }
+                                    else if (j == 1)
+                                    {
+                                        m_OA_OutOfStorage.Quantity = iCTPCount;
+                                    }
+                                    else if (j == 3)
+                                    {
+                                        m_OA_OutOfStorage.Quantity = iPSCount;
+                                    }
+                                    m_OA_OutOfStorage.AllMoney = 0;
+                                    m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
+                                    m_OA_OutOfStorage.Operator = CurrentUser.ShortName;
+                                    m_OA_OutOfStorage.Remark = "";
+                                    m_OA_OutOfStorage.TanPrice = 0;
+                                    m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
+                                    m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
+                                    m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
+                                    m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                
+
                 if (m_EC_MergerSingle.Keyid != null)
                 {
-                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList))
+                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList))
                     {
                         JavaScript.MessageBox("淇敼鎴愬姛", this, true, true);
                     }
@@ -773,6 +938,18 @@
                 }
                 else
                 {
+                    m_EC_MergerSingle.PMS_PaperSource = "";
+                    m_EC_MergerSingle.PMS_PaperNameType = 0;
+                    m_EC_MergerSingle.PMS_PaperSpecType = 0;
+                    m_EC_MergerSingle.PMS_CTPSpecType = 0;
+                    m_EC_MergerSingle.PMS_FilmType = 0;
+                    m_EC_MergerSingle.PMS_CTPCount = 0;
+                    m_EC_MergerSingle.PMS_PSCount = 0;
+                    m_EC_MergerSingle.PMS_PaperNameTypeName = "";
+                    m_EC_MergerSingle.PMS_PaperSpecTypeName = "";
+                    m_EC_MergerSingle.PMS_PlateSourceName = "";
+                    m_EC_MergerSingle.PMS_CTPSpecTypeName = "";
+                    m_EC_MergerSingle.PMS_FilmTypeName = "";
 
                     m_EC_MergerSingle.Member_id = CurrentUser.MemberId;
                     m_EC_MergerSingle.PO_OrderId = 0;
@@ -798,7 +975,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))
+                    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))
                     {
                         //JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
                         //btn_submit.Enabled = false;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
index fe4ebb3..0618829 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
@@ -87,292 +87,13 @@
         protected global::System.Web.UI.WebControls.Repeater RepMergerEdit;
 
         /// <summary>
-        /// PMS_PaperSource 鎺т欢銆�
+        /// Repeater1 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_PaperSource;
-
-        /// <summary>
-        /// PSF_PaperId1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId1;
-
-        /// <summary>
-        /// PMS_PaperCount1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden PMS_PaperCount1;
-
-        /// <summary>
-        /// PMS_PaperName 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperName;
-
-        /// <summary>
-        /// selPaperName 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect selPaperName;
-
-        /// <summary>
-        /// PMS_PaperSpecification 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperSpecification;
-
-        /// <summary>
-        /// SelPaperSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect SelPaperSpec;
-
-        /// <summary>
-        /// PMS_PaperCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperCount;
-
-        /// <summary>
-        /// PMS_PaperPositive 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperPositive;
-
-        /// <summary>
-        /// PMS_PaperConsume 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperConsume;
-
-        /// <summary>
-        /// selPMS_Machine 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect selPMS_Machine;
-
-        /// <summary>
-        /// PSF_Typesetting 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect PSF_Typesetting;
-
-        /// <summary>
-        /// PMS_IsRevisedEdition 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_IsRevisedEdition;
-
-        /// <summary>
-        /// PMS_IsColorSamples 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_IsColorSamples;
-
-        /// <summary>
-        /// PMS_ChromaticNumber 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_ChromaticNumber;
-
-        /// <summary>
-        /// selPlateType 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect selPlateType;
-
-        /// <summary>
-        /// PSF_PaperId2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId2;
-
-        /// <summary>
-        /// PlateSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PlateSpec;
-
-        /// <summary>
-        /// selCTPSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect selCTPSpec;
-
-        /// <summary>
-        /// selFilmSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlSelect selFilmSpec;
-
-        /// <summary>
-        /// lbCTPCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell lbCTPCount;
-
-        /// <summary>
-        /// tdCTPCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell tdCTPCount;
-
-        /// <summary>
-        /// CTPCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText CTPCount;
-
-        /// <summary>
-        /// lbPSSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSSpec;
-
-        /// <summary>
-        /// tdPSSpec 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPSSpec;
-
-        /// <summary>
-        /// PMS_PSBan 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PSBan;
-
-        /// <summary>
-        /// PSF_PaperId3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId3;
-
-        /// <summary>
-        /// lbPSCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSCount;
-
-        /// <summary>
-        /// tdPsCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPsCount;
-
-        /// <summary>
-        /// PSCount 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PSCount;
-
-        /// <summary>
-        /// PMS_CompletionTime 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_CompletionTime;
-
-        /// <summary>
-        /// PMS_TotalPrice 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_TotalPrice;
+        protected global::System.Web.UI.WebControls.Repeater Repeater1;
 
         /// <summary>
         /// PMS_Remarks 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index f98dd33..03d4f6f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -929,6 +929,7 @@
                         { value: '鍗曡壊', text: '鍗曡壊' },
                         { value: '鍙岃壊', text: '鍙岃壊' },
                         { value: '涓夎壊', text: '涓夎壊' },
+                        { value: '鍥涜壊', text: '鍥涜壊' },
                         { value: '鍥�+涓�', text: '鍥�+涓�' },
                     ];
 
@@ -1872,6 +1873,7 @@
                             { value: '鍗曡壊', text: '鍗曡壊' },
                             { value: '鍙岃壊', text: '鍙岃壊' },
                             { value: '涓夎壊', text: '涓夎壊' },
+                            { value: '鍥涜壊', text: '鍥涜壊' },
                             { value: '鍥�+涓�', text: '鍥�+涓�' },
                         ];
 

--
Gitblit v1.9.1