From a737eb14fe1b705b07f017e0edc002fae6f857c3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 12:59:20 +0800
Subject: [PATCH] 发版套数再增加自定义填写数字 补单的生产施工单不要默认开料规格的数据 "付款未开票”列表中的金额合计放在“金额”格子下面,既要单页合计,又要每页的全部合计 生产要求跟“数量:    ”的宽度一样 印刷数量的填写格子跟后道工序一样长

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 1035 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 689 insertions(+), 346 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index e47b8b9..b0d1827 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -13,6 +13,7 @@
 using CY.BLL.OA;
 using CY.Infrastructure.Query;
 using CY.WebForm.Pages.common;
+using CY.BLL.Inquiry;
 
 namespace CY.WebForm.Pages.business
 {
@@ -27,8 +28,25 @@
         OA_InventoryBLL bll_OA_InventoryBLL = null;
         OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
         public Guid targetid = Guid.Empty;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+
+
+
+        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 = "";
 
+        AfterParameterInfoBLL _afterParameterInfoBLL = null;
         //鍒濆鍖�
         public AgMergerOrderEdit()
         {
@@ -39,6 +57,9 @@
 
             bll_OA_InventoryBLL = new OA_InventoryBLL();
             bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+            bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
+            _afterParameterInfoBLL = new AfterParameterInfoBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
         }
 
         //椤甸潰鍔犺浇
@@ -59,55 +80,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 +186,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>();
@@ -154,7 +207,6 @@
                 }
                 else
                 {
-                    EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
                     EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(item.ToInt32().Value);
                     InquiryCommonModel _inquiryCommonModel = null;
                     if (null == _eC_OrderPrintParameter)
@@ -165,7 +217,20 @@
                     {
                         _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                     }
-                    _eC_OrderBasic.PrintDemandAfterWorksDemand = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+                    var ssss = "";
+                    if (!string.IsNullOrEmpty(_inquiryCommonModel.AfterWorksDemand))
+                    {
+                        ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand.Replace("灏侀潰鍚庨亾锛�", "").Replace("鍐呴〉鍚庨亾锛�", "");
+                    }
+                    if(_eC_OrderBasic.PrintTypeId == -1)
+                    {
+                        ssss = _inquiryCommonModel.PrintDemand.Replace(_inquiryCommonModel.PrintSizeName+ "锛�", "");
+                    }
+                    if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
+                    {
+                        ssss.Substring(0,499);
+                    }
+                    _eC_OrderBasic.PrintDemandAfterWorksDemand = ssss;
 
                     string strPrintSizeName;
                     strPrintSizeName = _inquiryCommonModel.PrintSizeName;
@@ -193,7 +258,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)
             {
@@ -214,124 +279,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();
 
 
@@ -344,6 +292,222 @@
                 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();
+
+
+            List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
+            if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count == 0)
+            {
+                m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
+                EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
+                m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
+
+            }
+
+            List<int> houdaolist = new List<int>();
+            List<string> houdaostringlist = new List<string>();
+            foreach (var eC_OrderBasic in mEC_OrderBasicList)
+            {
+                EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(eC_OrderBasic.Keyid.ToInt32().Value);
+                InquiryCommonModel _inquiryCommonModel = null;
+                if (null == _eC_OrderPrintParameter)
+                {
+                    _inquiryCommonModel = new InquiryCommonModel();
+                }
+                else
+                {
+                    _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+                }
+                var ssssss = _inquiryCommonModel.AfterWorkList;
+                var inquiryInsideModels = _inquiryCommonModel.InquiryInsideList;
+                if (ssssss != null && ssssss.Count > 0)
+                {
+                    foreach (var aaaaa in ssssss)
+                    {
+                        houdaolist.Add(aaaaa);
+                    }
+                }
+
+
+                if (inquiryInsideModels != null && inquiryInsideModels.Count > 0)
+                {
+                    foreach (var inquiryInsideModel in inquiryInsideModels)
+                    {
+                        var afterWorkList = inquiryInsideModel.AfterWorkList;
+                        if (afterWorkList != null && afterWorkList.Count > 0)
+                        {
+                            foreach (var aaaaa in afterWorkList)
+                            {
+                                houdaolist.Add(aaaaa);
+                            }
+                        }
+                    }
+                }
+
+                if (eC_OrderBasic.PrintTypeId == 29 || eC_OrderBasic.PrintTypeId == 27)
+                {
+                    if(houdaostringlist.Count(x=>x == _inquiryCommonModel.JTWZ) <= 0)
+                    {
+                        houdaostringlist.Add(_inquiryCommonModel.JTWZ);
+                    }
+                    if(eC_OrderBasic.PrintTypeId == 27)
+                    {
+                        houdaolist = new List<int>();
+                    }
+                }
+            }
+
+
+
+         
+            foreach (var c_MergerHoudaos in m_EC_MergerHoudaosList)
+            {
+              
+                string select = "<option value=''>鏃�</option>";
+                
+              
+
+                var sysInquiry_Afters = _afterParameterInfoBLL.GetModelList().Where(x => houdaolist.Contains(x.KeyId)).ToList();
+                if (sysInquiry_Afters != null && sysInquiry_Afters.Count > 0)
+                {
+                    foreach (var item in sysInquiry_Afters)
+                    {
+                        if (item.ParameterName == c_MergerHoudaos.PSF_Houdaogongxu)
+                        {
+                            select += "<option value='" + item.ParameterName + "'  selected=\"selected\" >" + item.ParameterName + "</option>";
+                        }
+                        else
+                        {
+                            select += "<option value='" + item.ParameterName + "'>" + item.ParameterName + "</option>";
+                        }
+
+                    }
+                }
+
+                foreach(var str in houdaostringlist)
+                {
+                    if (sysInquiry_Afters.Count(x => x.ParameterName == str) <= 0)
+                    {
+                        if (str == c_MergerHoudaos.PSF_Houdaogongxu)
+                        {
+                            select += "<option value='" + str + "' selected=\"selected\" >" + str + "</option>";
+                        }
+                        else
+                        {
+                            select += "<option value='" + str + "' >" + str + "</option>";
+                        }
+                    }
+                       
+                }
+
+               
+                c_MergerHoudaos.PSF_Houdaogongxu = select;
+            }
+
+            this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
+            this.RepeaterHoudaoList.DataBind();
+
+
+            //鑾峰彇寮�鏂欏昂瀵�
+            EC_CuttingPaperSpec model = new EC_CuttingPaperSpec();
+            //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;
         }
 
@@ -354,8 +518,67 @@
             {
                 #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_Fabantaoshu = Request["PSF_Fabantaoshu"].ToString2().Split(',');
+                string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
+                string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
+                string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
+                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(',');
+
+
+
+                string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
+                string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
+                string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
+                string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
+                string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');
+
 
                 int? keyid = Request["keyid"].ToInt32();
                 string[] orderId = new string[100];
@@ -386,18 +609,15 @@
 
                 string[] PO_Count = Request["PO_Count"].ToString2().Split(',');
                 string[] PO_TrimRequire = Request["PO_TrimRequire"].ToString2().Split(',');
-                string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
+                //string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
                 string[] PO_Requirement = Request["PO_Requirement"].ToString2().Split(',');
                 string[] PO_OrderNum = Request["txtOrderNum"].ToString2().Split(',');
                 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)
+                if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length  || orderId.Length != PO_Requirement.Length)
                 {
                     JavaScript.MessageBox("鎻愪氦澶辫触", this);
                     return;
@@ -407,16 +627,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();
@@ -430,7 +648,7 @@
                     m_EC_MergerOrders.PO_Count = PO_Count[i].ToInt32();
                     m_EC_MergerOrders.PO_Orderid = orderId[i].ToInt32();
                     m_EC_MergerOrders.PO_OrderNum = PO_OrderNum[i].ToString2();
-                    m_EC_MergerOrders.PO_PackagRequire = PO_PackagRequire[i].ToString2();
+                    m_EC_MergerOrders.PO_PackagRequire = "";// PO_PackagRequire[i].ToString2();
                     m_EC_MergerOrders.PO_TrimRequire = PO_TrimRequire[i].ToString2();
                     m_EC_MergerOrders.PO_RequirementWork = PO_Requirement[i].ToString2().Replace("锛�+-+锛�", ",");
                     m_EC_MergerOrders.PO_Size = PO_Size[i].ToString2();
@@ -453,89 +671,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)
@@ -578,9 +714,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();
@@ -588,93 +724,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)
@@ -698,7 +753,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)
                     {
@@ -747,9 +802,285 @@
                 }
 
 
+
+                List<EC_MergerForums> m_EC_MergerForumsList = new List<EC_MergerForums>();
+                List<OA_Inventory> m_OA_InventoryList = new List<OA_Inventory>();
+                List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
+                List<EC_MergerHoudaos> m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
+
+                for (int i = 0; i < PSF_Forumsid.Length; i++)
+                {
+                    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("锛�+-+锛�", ",");
+                    }
+                    m_EC_MergerForums.PSF_Fabantaoshu = PSF_Fabantaoshu[i];
+
+                    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_CTPSpecType = CTPSpecName[i].ToString2().Replace("锛�+-+锛�", ",");
+
+                    if (CTPCount[i].ToInt32() == null)
+                    {
+                        m_EC_MergerForums.PSF_CTPCount = 0;
+                    }
+                    else
+                    {
+                        m_EC_MergerForums.PSF_CTPCount = CTPCount[i].ToInt32();
+                    }
+                    m_EC_MergerForums.PSF_FilmType = "";
+                    m_EC_MergerForums.PSF_PSSpec = PSF_PSBan[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (PSCount[i].ToInt32() == null)
+                    {
+                        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);
+                                }
+                            }
+                        }
+                    }
+                }
+
+
+                for (int i = 0; i < selHoudaogongxu.Length; i++)
+                {
+                    EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
+                    m_EC_MergerHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace("锛�+-+锛�", ",");
+                    m_EC_MergerHoudaos.PSF_Shuliang = txtShuliang[i];
+                    m_EC_MergerHoudaos.PSF_Beishu = txtBeishu[i];
+                    m_EC_MergerHoudaos.PSF_Jichang = txtJichang[i];
+                    m_EC_MergerHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
+                    if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu)
+                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Shuliang)
+                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Beishu)
+                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Jichang)
+                        || !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Yaoqiu))
+                    {
+                        m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
+                    }
+                }
+
+
                 if (m_EC_MergerSingle.Keyid != null)
                 {
-                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList))
+                    if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_MergerHoudaosList))
                     {
                         JavaScript.MessageBox("淇敼鎴愬姛", this, true, true);
                     }
@@ -760,6 +1091,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;
@@ -785,7 +1128,7 @@
                         orderId = null;
                     }
 
-                    if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId))
+                    if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList, m_EC_MergerHoudaosList))
                     {
                         //JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
                         //btn_submit.Enabled = false;

--
Gitblit v1.9.1