From 5782e6fb084441dcf26db0b1aaf33e39204142b8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 四月 2025 08:52:33 +0800
Subject: [PATCH] 20250220设计订单菜单   会员菜单下     设计管理  12            会员菜单下     设计管理  01   会员菜单下     设计管理下     设计记件   /Pages/business/ShejijijianList.aspx   05  会员菜单下     设计管理下     新增订单   /Pages/business/ShejiOrderEdit.aspx   01  会员菜单下     设计管理下     订单管理   /Pages/business/ShejiOrderList.aspx   02

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx              |   13 
 CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx.designer.cs        |   14 
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js                             |  312 +++
 CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx                       |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx                       |    2 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs                           |   96 
 CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx.designer.cs       |   14 
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs            |  711 +++++++
 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs                                    |   17 
 CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs                         |  218 ++
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx                  |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs               |   10 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs            |  706 +++++++
 CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx                        |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.designer.cs |   44 
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs   |  549 +++++
 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs                             |   11 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx                       |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx                 |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx             |   17 
 CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx                   |    2 
 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs                            |   18 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.designer.cs |   98 +
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj                                |   24 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx                        |    4 
 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs                                  |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx                        |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx               |  741 +++++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs   |  170 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs          |  222 ++
 CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx                          |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx                    |    2 
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js                            |   93 
 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs                               |   46 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx                    |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx.cs           |   53 
 CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx.designer.cs        |   14 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs                                 |  103 +
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs                            |   70 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs          |  108 +
 CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx.designer.cs             |   14 
 CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx                         |    2 
 CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs                          |  224 ++
 CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx                    |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx                         |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs                  |  120 
 CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx                       |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx               |  549 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx             |  390 +++
 CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx                            |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx                 |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx                   |    4 
 52 files changed, 5,725 insertions(+), 136 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
index 4b893c0..18126f8 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -68,6 +68,23 @@
         }
 
         /// <summary>
+        /// 鏂板缓璁㈠崟(鍏�,鍚鏉�)鎵归噺
+        /// </summary>
+        /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+        /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+        /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+        /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+        /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+        /// <param name="commission">璁㈠崟鍙楃悊浣i噾(浼犲叆鍊煎ぇ浜�0鏃舵渶鍚庝細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+        /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+        /// <param name="orderPrintParameter">璁㈠崟鍗板埛鍙傛暟(閫夊~)</param> 
+        /// <returns></returns>
+        public bool NewOrderpiliang(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null)
+        {
+            return _iEC_OrderDAL.NewOrderpiliang(orderBasic, orderExtend, tradingSingle, acceptWayByOrder, payRequest, commission, seckillId, orderPrintParameter);
+        }
+
+        /// <summary>
         /// 鏂板缓璁㈠崟(涓�鑸�)
         /// </summary>
         /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 1565a5c..deab199 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -76,6 +76,18 @@
 
 
         /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="MemberId"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
+        {
+            return _eC_OrderBasicDAL.SelectModelPageSheji(pagination, MemberId,  BeginCreateTime,  EndCreateTime,  SellerOrderId,  PrintTypeId,  BusinessManagerId,  Shejirenyuan,  BuyerName,  DocumentName,  ShejiStatus);
+        }
+
+
+        /// <summary>
         /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
         /// </summary>
         /// <param name="pagination"></param>
@@ -211,6 +223,30 @@
         public EC_OrderBasic SelectModelById(int orderId)
         {
             return _eC_OrderBasicDAL.SelectModelById(orderId);
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+        /// </summary>
+        /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+        /// <returns></returns>
+        public Pay_TradingSingle GetPayTradingById(int orderId)
+        {
+            return _pay_TradingSingleDAL.GetOrderByIds(orderId).FirstOrDefault();
+        }
+
+
+         
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+        /// </summary>
+        /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+        /// <returns></returns>
+        public EC_OrderExtend GetModelByKeyid(int orderId)
+        {
+            return _eC_OrderExtendDAL.GetModelByKeyid(orderId);
         }
 
         /// <summary>
@@ -529,6 +565,16 @@
         }
 
         /// <summary>
+        /// 鍒ゆ柇鏌愯鍗曟槸鍚︽槸鍙︿竴璁㈠崟鐨勮嚜鍔ㄥ鍗忚鍗�
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
+        {
+            return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator);
+        }
+
+        /// <summary>
         /// WEB鏈嶅姟鑷姩瀹屾垚璁㈠崟
         /// </summary>
         public void AutoCompleteOrderByWebService()
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index fa9abd8..29f20c7 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -430,5 +430,16 @@
         /// <param name="FirmId"></param>
         /// <returns></returns>
         IEnumerable<Model.EC_OrderBasic> GetEC_OrderBasicListBydeliverorderId(Guid deliverorderId, Guid FirmId);
+
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="MemberId"></param>
+        /// <returns></returns>
+        IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId,string PrintTypeId,string BusinessManagerId,string Shejirenyuan,string BuyerName,string DocumentName,string ShejiStatus);
+
     }
 }
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
index 0133053..c36098f 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -48,6 +48,22 @@
         /// <returns></returns>
         bool NewOrder(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null);
 
+
+        /// <summary>
+        /// 鏂板缓璁㈠崟(鍏紝鍚鏉�)鎵归噺
+        /// </summary>
+        /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+        /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+        /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+        /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+        /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+        /// <param name="commission">璁㈠崟鍙楃悊浣i噾(浼犲叆鍊煎ぇ浜�0鏃朵細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+        /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+        /// <param name="orderPrintParameter">鍗板埛鍙傛暟瀵硅薄(绉掓潃璁㈠崟涓嶄紶鍏�)</param>
+        /// <returns></returns>
+        bool NewOrderpiliang(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null);
+
+
         /// <summary>
         /// 鏂板缓璁㈠崟(涓�鑸�)
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
index 4333eb7..159aa3b 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
@@ -44,6 +44,16 @@
         /// <param name="SurplusPrintNum"></param>
         /// <param name="Operator"></param>
         /// <returns></returns>
+        bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator);
+
+
+        /// <summary>
+        /// 鏇存柊璁㈠崟鎵╁睍琛ㄥ墿浣欏嵃鍒锋暟閲�
+        /// </summary>
+        /// <param name="Keyid"></param>
+        /// <param name="SurplusPrintNum"></param>
+        /// <param name="Operator"></param>
+        /// <returns></returns>
         bool UpSurplusPrintNumsql(int? Keyid, int? SurplusPrintNum, string Operator);
 
         /// <summary>
@@ -62,5 +72,13 @@
         /// <param name="orderParam">璁㈠崟鍗板埛閫夐」</param>
         /// <returns></returns>
         bool UpdateModel(Infrastructure.Domain.IAggregateRoot model, EC_OrderPrintParameter orderParam = null);
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        EC_OrderExtend GetModelByKeyid(int keyid);
     }
 }
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index a2cf9a1..bc331d9 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -317,6 +317,11 @@
         /// <summary>
         /// 涓氬姟缁忕悊
         /// </summary>
+        public string Shejiticheng { get; set; }
+
+        /// <summary>
+        /// 涓氬姟缁忕悊
+        /// </summary>
         public int? BusinessManagerId { get; set; }
 
 
@@ -526,6 +531,127 @@
         /// 鍗板埛鏁伴噺鍗曚綅
         /// </summary>
         public string yssldw { get; set; }
+
+        /// <summary>
+        /// 璁捐鐘舵�侊紝鏄惁涓嬪崟 `1鏄�2鍚�
+        /// </summary>
+        public int? ShejiStatus
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public int? Shejirenyuan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public string ShejirenyuanName { get; set; }
+
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public int? Shejileixing
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public string ShejileixingName { get; set; }
+
+        /// <summary>
+        /// 鍗曞弻闈�
+        /// </summary>
+        public string Danshuangmian { get; set; }
+
+        /// <summary>
+        /// 璁捐瑕佹眰
+        /// </summary>
+        public string Shejiyaoqiu { get; set; }
+
+
+
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public int? Shejirenyuanneiye
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public string ShejirenyuanNameneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public int? Shejileixingneiye
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public string ShejileixingNameneiye { get; set; }
+
+        /// <summary>
+        /// 鍗曞弻闈�
+        /// </summary>
+        public string Danshuangmianneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐瑕佹眰
+        /// </summary>
+        public string Shejiyaoqiuneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐鍗曚环
+        /// </summary>
+        public decimal? ShejiUnitPrice { get; set; }
+
+        /// <summary>
+        /// 璁捐閲戦
+        /// </summary>
+        public decimal? ShejiSumPrice { get; set; }
+
+
+        /// <summary>
+        /// 璁捐鍗曚环鍐呴〉
+        /// </summary>
+        public decimal? ShejiUnitPriceneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐閲戦鍐呴〉
+        /// </summary>
+        public decimal? ShejiSumPriceneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐鏁伴噺
+        /// </summary>
+        public int? Shejicount { get; set; }
+
+
+        /// <summary>
+        /// 璁捐鏁伴噺鍐呴〉
+        /// </summary>
+        public int? Shejicountneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐鏁伴噺鍐呴〉
+        /// </summary>
+        public string Shejicountneiyename { get; set; }
+
         #endregion
 
         #region Visiter
@@ -964,10 +1090,106 @@
             }
             else if ("printunit".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 102)
             {
-                this.OrderExtend.printunit = isChange ? MyConvert.ConvertToInt(value).Value : this.OrderExtend.printunit;
+                this.OrderExtend.printunit = isChange ? MyConvert.ConvertToInt32(value).Value : this.OrderExtend.printunit;
                 theValue = this.OrderExtend.printunit;
             }
 
+            else if ("ShejiStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 103)
+            {
+                this.ShejiStatus = isChange ? MyConvert.ConvertToInt32(value) : this.ShejiStatus;
+                theValue = this.ShejiStatus;
+            }
+            else if ("Shejirenyuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 104)
+            {
+                this.Shejirenyuan = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuan;
+                theValue = this.Shejirenyuan;
+            }
+            else if ("ShejirenyuanName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 105)
+            {
+                this.ShejirenyuanName = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanName;
+                theValue = this.ShejirenyuanName;
+            }
+            else if ("Shejileixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 106)
+            {
+                this.Shejileixing = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixing;
+                theValue = this.Shejileixing;
+            }
+            else if ("ShejileixingName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 107)
+            {
+                this.ShejileixingName = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingName;
+                theValue = this.ShejileixingName;
+            }
+            else if ("Danshuangmian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 108)
+            {
+                this.Danshuangmian = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmian;
+                theValue = this.Danshuangmian;
+            }
+            else if ("Shejiyaoqiu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 109)
+            {
+                this.Shejiyaoqiu = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiu;
+                theValue = this.Shejiyaoqiu;
+            }
+            else if ("Shejirenyuanneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 110)
+            {
+                this.Shejirenyuanneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye;
+                theValue = this.Shejirenyuanneiye;
+            }
+            else if ("ShejirenyuanNameneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 111)
+            {
+                this.ShejirenyuanNameneiye = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye;
+                theValue = this.ShejirenyuanNameneiye;
+            }
+            else if ("Shejileixingneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 112)
+            {
+                this.Shejileixingneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye;
+                theValue = this.Shejileixingneiye;
+            }
+            else if ("ShejileixingNameneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 113)
+            {
+                this.ShejileixingNameneiye = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye;
+                theValue = this.ShejileixingNameneiye;
+            }
+            else if ("Danshuangmianneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 114)
+            {
+                this.Danshuangmianneiye = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye;
+                theValue = this.Danshuangmianneiye;
+            }
+            else if ("Shejiyaoqiuneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 115)
+            {
+                this.Shejiyaoqiuneiye = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye;
+                theValue = this.Shejiyaoqiuneiye;
+            }
+
+            else if ("ShejiUnitPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 116)
+            {
+                this.ShejiUnitPrice = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPrice;
+                theValue = this.ShejiUnitPrice;
+            }
+            else if ("ShejiSumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 117)
+            {
+                this.ShejiSumPrice = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPrice;
+                theValue = this.ShejiSumPrice;
+            }
+            else if ("ShejiUnitPriceneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 118)
+            {
+                this.ShejiUnitPriceneiye = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye;
+                theValue = this.ShejiUnitPriceneiye;
+            }
+            else if ("ShejiSumPriceneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 119)
+            {
+                this.ShejiSumPriceneiye = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye;
+                theValue = this.ShejiSumPriceneiye;
+            }
+            else if ("Shejicount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 120)
+            {
+                this.Shejicount = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicount;
+                theValue = this.Shejicount;
+            }
+            else if ("Shejicountneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 121)
+            {
+                this.Shejicountneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye;
+                theValue = this.Shejicountneiye;
+            }
 
             #endregion
 
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
index d3c6997..f092f8c 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -251,6 +251,125 @@
             get;
             set;
         }
+        /// <summary>
+        /// 璁捐鐘舵�侊紝鏄惁涓嬪崟 `1鏄�2鍚�
+        /// </summary>
+        public int? ShejiStatus
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public int? Shejirenyuan
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public string ShejirenyuanName { get; set; }
+
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public int? Shejileixing
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public string ShejileixingName { get; set; }
+
+        /// <summary>
+        /// 鍗曞弻闈�
+        /// </summary>
+        public string Danshuangmian { get; set; }
+
+        /// <summary>
+        /// 璁捐瑕佹眰
+        /// </summary>
+        public string Shejiyaoqiu { get; set; }
+
+
+
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public int? Shejirenyuanneiye
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐浜哄憳
+        /// </summary>
+        public string ShejirenyuanNameneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public int? Shejileixingneiye
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 璁捐绫诲瀷
+        /// </summary>
+        public string ShejileixingNameneiye { get; set; }
+
+        /// <summary>
+        /// 鍗曞弻闈�
+        /// </summary>
+        public string Danshuangmianneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐瑕佹眰
+        /// </summary>
+        public string Shejiyaoqiuneiye { get; set; }
+
+
+        /// <summary>
+        /// 璁捐鍗曚环
+        /// </summary>
+        public decimal? ShejiUnitPrice { get; set; }
+
+        /// <summary>
+        /// 璁捐閲戦
+        /// </summary>
+        public decimal? ShejiSumPrice { get; set; }
+
+
+        /// <summary>
+        /// 璁捐鍗曚环鍐呴〉
+        /// </summary>
+        public decimal? ShejiUnitPriceneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐閲戦鍐呴〉
+        /// </summary>
+        public decimal? ShejiSumPriceneiye { get; set; }
+
+        /// <summary>
+        /// 璁捐鏁伴噺
+        /// </summary>
+        public int? Shejicount { get; set; }
+
+
+        /// <summary>
+        /// 璁捐鏁伴噺鍐呴〉
+        /// </summary>
+        public int? Shejicountneiye { get; set; }
+
+
+
+
         public string Duiyinghetongbianhao { get; set; }
         #endregion
 
@@ -506,7 +625,104 @@
                 this.Duiyinghetongbianhao = isChange ? MyConvert.ConvertToString(value) : this.Duiyinghetongbianhao;
                 theValue = this.Duiyinghetongbianhao;
             }
-            
+
+
+            else if ("ShejiStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 55)
+            {
+                this.ShejiStatus = isChange ? MyConvert.ConvertToInt32(value) : this.ShejiStatus;
+                theValue = this.ShejiStatus;
+            }
+            else if ("Shejirenyuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 56)
+            {
+                this.Shejirenyuan = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuan;
+                theValue = this.Shejirenyuan;
+            }
+            else if ("ShejirenyuanName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 57)
+            {
+                this.ShejirenyuanName = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanName;
+                theValue = this.ShejirenyuanName;
+            }
+            else if ("Shejileixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 58)
+            {
+                this.Shejileixing = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixing;
+                theValue = this.Shejileixing;
+            }
+            else if ("ShejileixingName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 59)
+            {
+                this.ShejileixingName = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingName;
+                theValue = this.ShejileixingName;
+            }
+            else if ("Danshuangmian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 60)
+            {
+                this.Danshuangmian = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmian;
+                theValue = this.Danshuangmian;
+            }
+            else if ("Shejiyaoqiu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 61)
+            {
+                this.Shejiyaoqiu = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiu;
+                theValue = this.Shejiyaoqiu;
+            }
+            else if ("Shejirenyuanneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 62)
+            {
+                this.Shejirenyuanneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye;
+                theValue = this.Shejirenyuanneiye;
+            }
+            else if ("ShejirenyuanNameneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 63)
+            {
+                this.ShejirenyuanNameneiye = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye;
+                theValue = this.ShejirenyuanNameneiye;
+            }
+            else if ("Shejileixingneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 64)
+            {
+                this.Shejileixingneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye;
+                theValue = this.Shejileixingneiye;
+            }
+            else if ("ShejileixingNameneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 65)
+            {
+                this.ShejileixingNameneiye = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye;
+                theValue = this.ShejileixingNameneiye;
+            }
+            else if ("Danshuangmianneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 66)
+            {
+                this.Danshuangmianneiye = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye;
+                theValue = this.Danshuangmianneiye;
+            }
+            else if ("Shejiyaoqiuneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 67)
+            {
+                this.Shejiyaoqiuneiye = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye;
+                theValue = this.Shejiyaoqiuneiye;
+            }
+            else if ("ShejiUnitPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 68)
+            {
+                this.ShejiUnitPrice = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPrice;
+                theValue = this.ShejiUnitPrice;
+            }
+            else if ("ShejiSumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
+            {
+                this.ShejiSumPrice = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPrice;
+                theValue = this.ShejiSumPrice;
+            }
+            else if ("ShejiUnitPriceneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70)
+            {
+                this.ShejiUnitPriceneiye = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye;
+                theValue = this.ShejiUnitPriceneiye;
+            }
+            else if ("ShejiSumPriceneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 71)
+            {
+                this.ShejiSumPriceneiye = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye;
+                theValue = this.ShejiSumPriceneiye;
+            }
+            else if ("Shejicount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 72)
+            {
+                this.Shejicount = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicount;
+                theValue = this.Shejicount;
+            }
+            else if ("Shejicountneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 73)
+            {
+                this.Shejicountneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye;
+                theValue = this.Shejicountneiye;
+            }
+
             #endregion
 
 
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index d4e784a..690d966 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -3197,5 +3197,75 @@
             }
         }
 
+
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="MemberId"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
+        {
+            try
+            {
+                string condition = " 1=1 ";
+                if (MemberId != Guid.Empty)
+                {
+                    var originalGuid = MemberId;
+                    Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
+                    condition += " and ob.SellerId = '" + reversedGuid + "'";
+                }
+                  
+
+
+                if (!string.IsNullOrEmpty(BeginCreateTime))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", BeginCreateTime);
+
+                if (!string.IsNullOrEmpty(EndCreateTime))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndCreateTime);
+
+                if (!string.IsNullOrEmpty(SellerOrderId))
+                    condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'";
+
+                if (!string.IsNullOrEmpty(PrintTypeId))
+                {
+                    condition += " and ob.PrintTypeId = " + PrintTypeId + "";
+                }
+                if (!string.IsNullOrEmpty(BusinessManagerId))
+                {
+                    condition += " and oe.BusinessManagerId = " + BusinessManagerId + "";
+                }
+                if (!string.IsNullOrEmpty(Shejirenyuan))
+                {
+                    condition += " and ( oe.Shejirenyuan = " + Shejirenyuan + " or oe.Shejirenyuanneiye = " + Shejirenyuan + " )";
+                }
+                if (!string.IsNullOrEmpty(BuyerName))
+                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
+                if (!string.IsNullOrEmpty(DocumentName))
+                    condition += " and ob.DocumentName like '%" + DocumentName + "%'";
+
+                if (!string.IsNullOrEmpty(ShejiStatus))
+                {
+                    if(ShejiStatus == "1")
+                    {
+                        condition += " and oe.ShejiStatus = " + ShejiStatus + "";
+                    }
+                    else
+                    {
+                        condition += " and oe.ShejiStatus != 1 ";
+                    }
+                }
+
+                return _dataBase.SelectModelPage<Model.EC_OrderBasic>(pagination, " ob.*,oe.BusinessManagerId,oe.shifouDelivery,oe.IsPrintfengqian,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime  ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,oe.Duiyinghetongbianhao,oe.[Shejirenyuan],oe.[Shejileixing] ,oe.[Danshuangmian],oe.[Shejirenyuanneiye],oe.[Shejileixingneiye],oe.[Danshuangmianneiye],oe.[Shejiyaoqiu],oe.[Shejiyaoqiuneiye],oe.[ShejirenyuanName],oe.[ShejirenyuanNameneiye],oe.[ShejiStatus],oe.[ShejileixingName],oe.[ShejileixingNameneiye],oe.[ShejiUnitPrice] ,oe.[ShejiSumPrice],oe.[ShejiUnitPriceneiye],oe.[ShejiSumPriceneiye] ,oe.[Shejicount],oe.[Shejicountneiye] ,pt.PrintName as PrintTypeName ", "  EC_OrderBasic as ob Inner Join [EC_OrderExtend]  as oe On ob.Keyid=oe.Keyid   Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", " ob.CreateTime desc", " CreateTime desc ", condition);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
     }
 }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index d94b0db..3f0ad79 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -156,6 +156,109 @@
             return true;
         }
 
+
+        /// <summary>
+        /// 鏂板缓璁㈠崟(鍏紝鍚鏉�)鎵归噺
+        /// </summary>
+        /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+        /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+        /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+        /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+        /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+        /// <param name="commission">璁㈠崟鍙楃悊浣i噾(浼犲叆鍊煎ぇ浜�0鏃朵細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+        /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+        /// <param name="orderPrintParameter">鍗板埛鍙傛暟瀵硅薄(绉掓潃璁㈠崟涓嶄紶鍏�)</param>
+        /// <returns></returns>
+        public bool NewOrderpiliang(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null)
+        {
+            try
+            {
+                _eC_OrderExtendDAL = new EC_OrderExtendDAL(_dataBase);
+                _pay_TradingSingleDAL = new Pay_TradingSingleDAL(_dataBase);
+                _eC_AcceptWayByOrderDAL = new EC_AcceptWayByOrderDAL(_dataBase);
+                _eC_OrderOperateDAL = new EC_OrderOperateDAL(_dataBase);
+                _eC_MemberBasicDAL = new EC_MemberBasicDAL(_dataBase);
+                _oA_CorporateClientsDAL = new OA_CorporateClientsDAL(_dataBase);
+                //using (System.Transactions.TransactionScope tran = new System.Transactions.TransactionScope())
+                //{
+                    bool isWin = false;
+                    isWin = _eC_OrderBasicDAL.InserModel(orderBasic);
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+                    acceptWayByOrder.TargetId = tradingSingle.OrderId = orderExtend.Keyid = orderBasic.Keyid;//鑾峰彇杩斿洖鐨勮鍗曞敮涓�缂栧彿
+                    isWin = _eC_OrderExtendDAL.InserModel(orderExtend);
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+
+                    isWin = _eC_AcceptWayByOrderDAL.InserModel(acceptWayByOrder);
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+                    isWin = _pay_TradingSingleDAL.InserModel(tradingSingle);
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+
+                    //澧炲姞涓嬪崟鎿嶄綔璁板綍
+                    isWin = _eC_OrderOperateDAL.InserModel(new EC_OrderOperate()
+                    {
+                        OperateType = 1,
+                        Operator = orderBasic.Operator,
+                        OrderId = orderBasic.Keyid,
+                        Remark = string.Empty
+                    });
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+
+                    if (null != payRequest)//鏈夋敮浠樿姹傚垯璋冪敤鏀粯璁㈠崟鏂规硶
+                    {
+                        //浼犲叆鐨刾ayRequest.Subject蹇呴』涓烘牸寮忓寲鍣� 鏍煎紡渚嬪:{0},{1},{2}
+                        //0:Keyid,1:SellerOrderId,2:DocumentName
+                        payRequest.Subject = string.Format(payRequest.Subject, orderBasic.Keyid, orderBasic.SellerOrderId, orderBasic.DocumentName);
+                        isWin = _eC_OrderBasicDAL.PayOrder(orderBasic.Keyid.Value, payRequest, commission, 0);
+                    }
+
+                    if (0 < seckillId)
+                    {
+                        _eC_SeckillBusinessDAL = new EC_SeckillBusinessDAL(_dataBase);
+                        //鑻ユ湁绉掓潃涓氬姟缂栧彿鍒欐墸闄ゅ叾绉掓潃鏁伴噺1
+                        isWin = _eC_SeckillBusinessDAL.DecreaseSeckillNum(seckillId, 1, orderBasic.BuyerId);
+                    }
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+                    if (null != orderPrintParameter)
+                    {
+                        _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
+                        orderPrintParameter.OrderId = orderBasic.Keyid.Value;
+                        isWin = _eC_OrderPrintParameterDAL.InserModel(orderPrintParameter);
+                    }
+
+                    if (!isWin)
+                    {
+                        return false;
+                    }
+                //    else
+                //        tran.Complete();
+                //}
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
         /// <summary>
         /// 鏂板缓璁㈠崟(涓�鑸�)
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
index 9c0b71b..b8b6f62 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -98,7 +98,27 @@
                       new SqlParameter("@Productionprogress",trueModel.Productionprogress),
                        new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
                        new SqlParameter("@printunit",trueModel.printunit),
-                         new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao)
+                         new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao),
+
+                            new SqlParameter("@ShejiStatus",trueModel.ShejiStatus.HasValue?trueModel.ShejiStatus.Value:0),
+                               new SqlParameter("@Shejirenyuan",trueModel.Shejirenyuan.HasValue?trueModel.Shejirenyuan.Value:0),
+                                  new SqlParameter("@ShejirenyuanName",string.IsNullOrEmpty(trueModel.ShejirenyuanName)?"":trueModel.ShejirenyuanName),
+                                     new SqlParameter("@Shejileixing",trueModel.Shejileixing.HasValue?trueModel.Shejileixing.Value:0),
+                                        new SqlParameter("@ShejileixingName",string.IsNullOrEmpty(trueModel.ShejileixingName)?"":trueModel.ShejileixingName),
+                                           new SqlParameter("@Danshuangmian",string.IsNullOrEmpty(trueModel.Danshuangmian)?"":trueModel.Danshuangmian),
+                                              new SqlParameter("@Shejirenyuanneiye",trueModel.Shejirenyuanneiye.HasValue?trueModel.Shejirenyuanneiye.Value:0),
+                                                 new SqlParameter("@ShejirenyuanNameneiye",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye)?"":trueModel.ShejirenyuanNameneiye),
+                                                    new SqlParameter("@Shejileixingneiye",trueModel.Shejileixingneiye.HasValue?trueModel.Shejileixingneiye.Value:0),
+                                                       new SqlParameter("@ShejileixingNameneiye",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye)?"":trueModel.ShejileixingNameneiye),
+                                                          new SqlParameter("@Danshuangmianneiye",string.IsNullOrEmpty(trueModel.Danshuangmianneiye)?"":trueModel.Danshuangmianneiye),
+                                                             new SqlParameter("@Shejiyaoqiu",string.IsNullOrEmpty(trueModel.Shejiyaoqiu)?"":trueModel.Shejiyaoqiu),
+                                                                new SqlParameter("@Shejiyaoqiuneiye",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye)?"":trueModel.Shejiyaoqiuneiye),
+                                                                   new SqlParameter("@ShejiUnitPrice",trueModel.ShejiUnitPrice.HasValue?trueModel.ShejiUnitPrice.Value:0),
+                                                                      new SqlParameter("@ShejiSumPrice",trueModel.ShejiSumPrice.HasValue?trueModel.ShejiSumPrice.Value:0),
+                                                                         new SqlParameter("@ShejiUnitPriceneiye",trueModel.ShejiUnitPriceneiye.HasValue?trueModel.ShejiUnitPriceneiye.Value:0),
+                                                                            new SqlParameter("@ShejiSumPriceneiye",trueModel.ShejiSumPriceneiye.HasValue?trueModel.ShejiSumPriceneiye.Value:0),
+                                                                              new SqlParameter("@Shejicount",trueModel.Shejicount.HasValue?trueModel.Shejicount.Value:0),
+                                                                            new SqlParameter("@Shejicountneiye",trueModel.Shejicountneiye.HasValue?trueModel.Shejicountneiye.Value:0),
 
             };
             int i = -1;
@@ -161,7 +181,26 @@
                     new SqlParameter("@BagNum",trueModel.BagNum),
                        new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
                        new SqlParameter("@printunit",trueModel.printunit),
-                         new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao)
+                         new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao),
+                          new SqlParameter("@ShejiStatus",trueModel.ShejiStatus.HasValue?trueModel.ShejiStatus.Value:0),
+                               new SqlParameter("@Shejirenyuan",trueModel.Shejirenyuan.HasValue?trueModel.Shejirenyuan.Value:0),
+                                  new SqlParameter("@ShejirenyuanName",string.IsNullOrEmpty(trueModel.ShejirenyuanName)?"":trueModel.ShejirenyuanName),
+                                     new SqlParameter("@Shejileixing",trueModel.Shejileixing.HasValue?trueModel.Shejileixing.Value:0),
+                                        new SqlParameter("@ShejileixingName",string.IsNullOrEmpty(trueModel.ShejileixingName)?"":trueModel.ShejileixingName),
+                                           new SqlParameter("@Danshuangmian",string.IsNullOrEmpty(trueModel.Danshuangmian)?"":trueModel.Danshuangmian),
+                                              new SqlParameter("@Shejirenyuanneiye",trueModel.Shejirenyuanneiye.HasValue?trueModel.Shejirenyuanneiye.Value:0),
+                                                 new SqlParameter("@ShejirenyuanNameneiye",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye)?"":trueModel.ShejirenyuanNameneiye),
+                                                    new SqlParameter("@Shejileixingneiye",trueModel.Shejileixingneiye.HasValue?trueModel.Shejileixingneiye.Value:0),
+                                                       new SqlParameter("@ShejileixingNameneiye",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye)?"":trueModel.ShejileixingNameneiye),
+                                                          new SqlParameter("@Danshuangmianneiye",string.IsNullOrEmpty(trueModel.Danshuangmianneiye)?"":trueModel.Danshuangmianneiye),
+                                                             new SqlParameter("@Shejiyaoqiu",string.IsNullOrEmpty(trueModel.Shejiyaoqiu)?"":trueModel.Shejiyaoqiu),
+                                                                new SqlParameter("@Shejiyaoqiuneiye",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye)?"":trueModel.Shejiyaoqiuneiye),
+                                                                   new SqlParameter("@ShejiUnitPrice",trueModel.ShejiUnitPrice.HasValue?trueModel.ShejiUnitPrice.Value:0),
+                                                                      new SqlParameter("@ShejiSumPrice",trueModel.ShejiSumPrice.HasValue?trueModel.ShejiSumPrice.Value:0),
+                                                                         new SqlParameter("@ShejiUnitPriceneiye",trueModel.ShejiUnitPriceneiye.HasValue?trueModel.ShejiUnitPriceneiye.Value:0),
+                                                                            new SqlParameter("@ShejiSumPriceneiye",trueModel.ShejiSumPriceneiye.HasValue?trueModel.ShejiSumPriceneiye.Value:0),
+                                                                              new SqlParameter("@Shejicount",trueModel.Shejicount.HasValue?trueModel.Shejicount.Value:0),
+                                                                            new SqlParameter("@Shejicountneiye",trueModel.Shejicountneiye.HasValue?trueModel.Shejicountneiye.Value:0),
             };
             try
             {
@@ -383,9 +422,62 @@
             }
         }
 
+
+
+        /// <summary>
+        /// 鏇存柊璁㈠崟鎵╁睍琛ㄥ墿浣欏嵃鍒锋暟閲�
+        /// </summary>
+        /// <param name="Keyid"></param>
+        /// <param name="SurplusPrintNum"></param>
+        /// <param name="Operator"></param>
+        /// <returns></returns>
+        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
+        {
+
+            try
+            {
+                var sqlStr = "UPDATE [EC_OrderExtend] SET [ShejiStatus]="+ ShejiStatus + "  WHERE Keyid=@Keyid ";
+                SqlParameter par = new SqlParameter("@Keyid", Keyid);
+                _dataBase.ExecuteSql(sqlStr, par);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
         {
             throw new NotImplementedException();
         }
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public EC_OrderExtend GetModelByKeyid(int keyid)
+        {
+            try
+            {
+                string condition = "  ";
+                 
+                    condition = " Keyid=" + keyid + "";
+                
+
+                //  return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<EC_OrderExtend> result = _dataBase.SelectModel<EC_OrderExtend>("*", "EC_OrderExtend", condition) as IList<EC_OrderExtend>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index f6872de..fe405ce 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1899,6 +1899,8 @@
     <Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
     <Content Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx" />
     <Content Include="Pages\business\DeliverPlanTimeEdit.aspx" />
+    <Content Include="Pages\business\ShejiOrderDeatil.aspx" />
+    <Content Include="Pages\business\ShejiOrderList.aspx" />
     <Content Include="Pages\business\SHejiOrderEdit.aspx" />
     <Content Include="Pages\business\ShejijijianEdit.aspx" />
     <Content Include="Pages\business\ShejijijianList.aspx" />
@@ -1906,6 +1908,7 @@
     <Content Include="Pages\business\OrderSonghuoanchiList.aspx" />
     <Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
     <Content Include="Pages\business\ShiJuanBiaoQianList.aspx" />
+    <Content Include="Pages\business\ShejiOrderxiadan.aspx" />
     <Content Include="Pages\business\WaixieOrderPrint.aspx" />
     <Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
     <Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
@@ -3449,6 +3452,20 @@
     <Compile Include="Pages\business\FileUploadHandler.ashx.cs">
       <DependentUpon>FileUploadHandler.ashx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\business\ShejiOrderDeatil.aspx.cs">
+      <DependentUpon>ShejiOrderDeatil.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\ShejiOrderDeatil.aspx.designer.cs">
+      <DependentUpon>ShejiOrderDeatil.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\ShejiOrderList.aspx.cs">
+      <DependentUpon>ShejiOrderList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\ShejiOrderList.aspx.designer.cs">
+      <DependentUpon>ShejiOrderList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\business\SHejiOrderEdit.aspx.cs">
       <DependentUpon>SHejiOrderEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3498,6 +3515,13 @@
     <Compile Include="Pages\business\ShiJuanBiaoQianList.aspx.designer.cs">
       <DependentUpon>ShiJuanBiaoQianList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\business\ShejiOrderxiadan.aspx.cs">
+      <DependentUpon>ShejiOrderxiadan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\ShejiOrderxiadan.aspx.designer.cs">
+      <DependentUpon>ShejiOrderxiadan.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
       <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 5e265f4..5f7d22e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -62,7 +62,7 @@
               <tr>
                         <td  >
 <%--                            <span onclick="onViewuplod('<%=BuyerId %>')"   <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>  >鏌ョ湅鍚堝悓 </span>--%>
-                            <input type="button" id="btnPrint"  <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>   value="鏌ョ湅鍚堝悓" onclick="onViewuplod('<%=BuyerId %>')">
+                            <input type="button"    <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>   value="鏌ョ湅鍚堝悓" onclick="onViewuplod('<%=BuyerId %>')">
                         </td>
                     </tr>
              </table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
index 80bc013..d2ef557 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -112,11 +112,11 @@
                 CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
                 return false;
             }
-            if (CurrentUser.MemberId!=Guid.Parse(UtilConst.AdminFirmId)&&_eC_OrderBasic.BuyerId != CurrentUser.MemberId && _eC_OrderBasic.SellerId != CurrentUser.MemberId)
-            {
-                CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
-                return false;
-            }
+            //if (CurrentUser.MemberId!=Guid.Parse(UtilConst.AdminFirmId)&&_eC_OrderBasic.BuyerId != CurrentUser.MemberId && _eC_OrderBasic.SellerId != CurrentUser.MemberId)
+            //{
+            //    CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+            //    return false;
+            //}
             EC_AcceptWayByOrderBLL _eC_AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
             EC_AcceptWayByOrder _eC_AcceptWayByOrder = _eC_AcceptWayByOrderBLL.GetModelByTargetId(orderId.Value);
             if (null == _eC_AcceptWayByOrder)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 3cb4293..40fa8cf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,8 +9,8 @@
     <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
     <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
     <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
-    <script src="../../js/Inquiry/Inquiry.js?v=184" type="text/javascript"></script>
-    <script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=185" type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=47" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index 7d2acde..6d8a71f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,8 +9,8 @@
     <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
     <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
     <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
-    <script src="../../js/Inquiry/Inquiry.js?v=179" type="text/javascript"></script>
-    <script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=180" type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=47" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
 
@@ -290,6 +290,8 @@
             </td>
             <td align="left">
                 <input id='txtSumPrice' runat="server" maxlength='16' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
+                 <input type="hidden" id='ShijuanprintCount' runat="server" />
+                 <input type="hidden" id='DatikaprintCount' runat="server" />
             </td>
             <td align="right" id="selVerifyWay12">
                 鏍$鏂瑰紡锛�
@@ -373,6 +375,739 @@
                    </tr>
               </table>
            <br />
+
+          <table class="table2 table2Left" id="BlackAndWhite29"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan29' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejileixing29' runat="server" keepdefaultstyle='true' >
+                               <option  value="1">鏂囧瓧鐓ф帓</option>
+                             <option  value="2">鏁撮〉琛ㄦ牸</option>
+                             <option  value="3">鍗婃枃鍗婅〃</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   鍗曞弻闈細
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelDanshuangmian29' runat="server" keepdefaultstyle='true' >
+                              <option value="鍗曢潰">鍗曢潰</option>
+                                <option value="鍙岄潰鐩稿悓">鍙岄潰鐩稿悓</option>
+                                <option value="鍙岄潰涓嶅悓">鍙岄潰涓嶅悓</option>
+                </select>
+                </td>
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu29" name="txtShejiyaoqiu29" runat="server" style="width: 692px; height: 30px;"  ></textarea>
+                </td>
+            </tr>
+        </table>
+
+          <table class="table2 table2Left" id="Book6"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐灏侀潰锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan6' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejileixing6' runat="server" keepdefaultstyle='true' >
+                              <option  value="6">鏂囧瓧灏侀潰</option>
+                             <option  value="7">璁捐灏侀潰</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                                <option  value="8">瀹緵鏂囦欢</option>
+                           
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   鍗曞弻闈細
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelDanshuangmian6' runat="server" keepdefaultstyle='true' >
+                              <option value="鍗曢潰">鍗曢潰</option>
+                                <option value="鍙岄潰">鍙岄潰</option>
+                </select>
+                </td>
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu6" name="txtShejiyaoqiu6" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+               <tr style=" height:11px;">
+                   <td colspan="6"></td>
+               </tr>
+              <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   鍐呴〉璁捐锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuanneiye6' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3" >
+                          <select id='SelShejileixingneiye6' runat="server" keepdefaultstyle='true' >
+                             <option  value="1">鏂囧瓧鐓ф帓</option>
+                             <option  value="2">鏁撮〉琛ㄦ牸</option>
+                             <option  value="3">鍗婃枃鍗婅〃</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                                <option  value="8">瀹緵鏂囦欢</option>
+                           
+                </select>
+                </td>
+                 
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye6" name="txtShejiyaoqiuneiye6" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="PictureAlbumNew15"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐灏侀潰锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan15' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejileixing15' runat="server" keepdefaultstyle='true' >
+                             <option  value="7">璁捐灏侀潰</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                                <option  value="8">瀹緵鏂囦欢</option>
+                           
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   鍗曞弻闈細
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelDanshuangmian15' runat="server" keepdefaultstyle='true' >
+                              <option value="鍗曢潰">鍗曢潰</option>
+                                <option value="鍙岄潰">鍙岄潰</option>
+                </select>
+                </td>
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu15" name="txtShejiyaoqiu15" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+               <tr style=" height:11px;">
+                   <td colspan="6"></td>
+               </tr>
+              <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   鍐呴〉璁捐锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuanneiye15' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3" >
+                          <select id='SelShejileixingneiye15' runat="server" keepdefaultstyle='true' >
+                             <option  value="2">鏁撮〉琛ㄦ牸</option>
+                             <option  value="3">鍗婃枃鍗婅〃</option>
+                                <option  value="9">褰╄壊璁捐</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                                <option  value="8">瀹緵鏂囦欢</option>
+                           
+                </select>
+                </td>
+                 
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye15" name="txtShejiyaoqiuneiye15" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+          <table class="table2 table2Left" id="DMInquiry14"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan14' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejileixing14' runat="server" keepdefaultstyle='true' >
+                                 <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   鍗曞弻闈細
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelDanshuangmian14' runat="server" keepdefaultstyle='true' >
+                              <option value="鍗曢潰">鍗曢潰</option>
+                                <option value="鍙岄潰鐩稿悓">鍙岄潰鐩稿悓</option>
+                                <option value="鍙岄潰涓嶅悓">鍙岄潰涓嶅悓</option>
+                </select>
+                </td>
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu14" name="txtShejiyaoqiu14" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="ReceiptDocument27"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan27' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3" >
+                          <select id='SelShejileixing27' runat="server" keepdefaultstyle='true' >
+                                  <option  value="11">鐓ф帓鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu27" name="txtShejiyaoqiu27" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Envelop21"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan21' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing21' runat="server" keepdefaultstyle='true' >
+                               <option  value="11">鐓ф帓鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu21" name="txtShejiyaoqiu21" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="NewsPaper7"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan7' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing7' runat="server" keepdefaultstyle='true' >
+                               <option  value="12">璁捐鐓ф帓</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu7" name="txtShejiyaoqiu7" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+           <table class="table2 table2Left" id="Shijuan38"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璇曞嵎鐓ф帓锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan38' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:left;" colspan="4">
+                   <input id='txtShejileixingName38' runat="server" maxlength="100"   />  P
+                </td>
+                
+                 
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu38" name="txtShejiyaoqiu38" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+               <tr style=" height:11px;">
+                   <td colspan="6"></td>
+               </tr>
+              <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   绛旈鍗$収鎺掞細
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuanneiye38' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                <td style="width: 100px;text-align:left;" colspan="4">
+                   <input id='txtShejileixingNameneiye38' runat="server" maxlength="100"   />  P
+                </td>
+                
+                 
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye38" name="txtShejiyaoqiuneiye38" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Adhesive20"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan20' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing20' runat="server" keepdefaultstyle='true' >
+                                 <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu20" name="txtShejiyaoqiu20" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Reticule16"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan16' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing16' runat="server" keepdefaultstyle='true' >
+                               <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu16" name="txtShejiyaoqiu16" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Note22"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan22' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing22' runat="server" keepdefaultstyle='true' >
+                               <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu22" name="txtShejiyaoqiu22" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="GongWenZhi39"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;" colspan="5"  >
+                          <select id='SelShejirenyuan39' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu39" name="txtShejiyaoqiu39" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Calendary23"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan23' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing23' runat="server" keepdefaultstyle='true' >
+                               <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu23" name="txtShejiyaoqiu23" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="DeskCalendar25"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan25' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing25' runat="server" keepdefaultstyle='true' >
+                               <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu25" name="txtShejiyaoqiu25" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+         <table class="table2 table2Left" id="Packet26"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;"  >
+                          <select id='SelShejirenyuan26' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 <td style="width: 100px;text-align:right;">
+                   璁捐绫诲瀷锛�
+                </td>
+                <td   style="text-align:left;"  colspan="3"  >
+                          <select id='SelShejileixing26' runat="server" keepdefaultstyle='true' >
+                               <option  value="10">璁捐鍒朵綔</option>
+                             <option  value="4">鎵弿鐓у仛</option>
+                             <option  value="5">鏂囦欢淇敼</option>
+                           
+                </select>
+                </td>
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu26" name="txtShejiyaoqiu26" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+
+         <table class="table2 table2Left" id="Qita1111"  align="left" style=" width:1000px;display:none;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        璁捐瑕佹眰
+                    </th>
+                </tr>
+            </thead>
+            <tr   style=" height:11px;">
+                <td style="width: 100px;text-align:right;">
+                   璁捐浜哄憳锛�
+                </td>
+                <td   style="text-align:left;" colspan="5"  >
+                          <select id='SelShejirenyuan1111' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+                </td>
+                 
+                  
+            </tr>
+                <tr>
+                <td style="width: 100px; text-align:right;">
+                    璁捐瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;" colspan="5">
+                    <textarea   maxlength="500"  id="txtShejiyaoqiu1111" name="txtShejiyaoqiu1111" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+        </table>
+
+          <br />
+
+
         <table class="table2 table2Left"  align="left" style=" width:1000px;">
             <thead>
                 <tr>
@@ -482,7 +1217,7 @@
 
                     
 
-                    <input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />
+                   <%-- <input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />--%>
                 </td>
             </tr>
             <tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
index 9359781..ba3a2df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
@@ -153,6 +153,121 @@
 
             //rptInquiryCommon.DataSource = new List<InquiryCommonModel>() { _inquiryCommonModel };
             //rptInquiryCommon.DataBind();
+            #region 缁戝畾璁捐淇℃伅
+            if (_eC_OrderBasic.PrintTypeId == 29)
+            {
+                this.SelShejirenyuan29.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing29.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.SelDanshuangmian29.Value = _eC_OrderBasic.Danshuangmian;
+                this.txtShejiyaoqiu29.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 6)
+            {
+                this.SelShejirenyuan6.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing6.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.SelDanshuangmian6.Value = _eC_OrderBasic.Danshuangmian;
+                this.txtShejiyaoqiu6.Value = _eC_OrderBasic.Shejiyaoqiu;
+
+                this.SelShejirenyuanneiye6.Value = _eC_OrderBasic.Shejirenyuanneiye.HasValue ? _eC_OrderBasic.Shejirenyuanneiye.Value.ToString() : "";
+                this.SelShejileixingneiye6.Value = _eC_OrderBasic.Shejileixingneiye.HasValue ? _eC_OrderBasic.Shejileixingneiye.Value.ToString() : "";
+                this.txtShejiyaoqiuneiye6.Value = _eC_OrderBasic.Shejiyaoqiuneiye;
+            }
+            else if(_eC_OrderBasic.PrintTypeId == 15)
+            {
+                this.SelShejirenyuan15.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing15.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.SelDanshuangmian15.Value = _eC_OrderBasic.Danshuangmian;
+                this.txtShejiyaoqiu15.Value = _eC_OrderBasic.Shejiyaoqiu;
+
+                this.SelShejirenyuanneiye15.Value = _eC_OrderBasic.Shejirenyuanneiye.HasValue ? _eC_OrderBasic.Shejirenyuanneiye.Value.ToString() : "";
+                this.SelShejileixingneiye15.Value = _eC_OrderBasic.Shejileixingneiye.HasValue ? _eC_OrderBasic.Shejileixingneiye.Value.ToString() : "";
+                this.txtShejiyaoqiuneiye15.Value = _eC_OrderBasic.Shejiyaoqiuneiye;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 14)
+            {
+                this.SelShejirenyuan14.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing14.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.SelDanshuangmian14.Value = _eC_OrderBasic.Danshuangmian;
+                this.txtShejiyaoqiu14.Value = _eC_OrderBasic.Shejiyaoqiu;     
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 27)
+            {
+                this.SelShejirenyuan27.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing27.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu27.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 21)
+            {
+                this.SelShejirenyuan21.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing21.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu21.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 7)
+            {
+                this.SelShejirenyuan7.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing7.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu7.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 38)
+            {
+                this.SelShejirenyuan38.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.txtShejileixingName38.Value = _eC_OrderBasic.ShejileixingName;
+                this.txtShejiyaoqiu38.Value = _eC_OrderBasic.Shejiyaoqiu;
+                this.ShijuanprintCount.Value = _eC_OrderBasic.Shejicount.HasValue ? _eC_OrderBasic.Shejicount.Value.ToString() : "0";
+
+                this.SelShejirenyuanneiye38.Value = _eC_OrderBasic.Shejirenyuanneiye.HasValue ? _eC_OrderBasic.Shejirenyuanneiye.Value.ToString() : "";
+                this.txtShejileixingNameneiye38.Value = _eC_OrderBasic.ShejileixingNameneiye;
+                this.txtShejiyaoqiuneiye38.Value = _eC_OrderBasic.Shejiyaoqiuneiye;
+                this.DatikaprintCount.Value = _eC_OrderBasic.Shejicountneiye.HasValue ? _eC_OrderBasic.Shejicountneiye.Value.ToString() : "0";
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 20)
+            {
+                this.SelShejirenyuan20.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing20.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu20.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 16)
+            {
+                this.SelShejirenyuan16.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing16.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu16.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 22)
+            {
+                this.SelShejirenyuan22.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing22.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu22.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 39)
+            {
+                this.SelShejirenyuan39.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.txtShejiyaoqiu39.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 23)
+            {
+                this.SelShejirenyuan23.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing23.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu23.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 25)
+            {
+                this.SelShejirenyuan25.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing25.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu25.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else if (_eC_OrderBasic.PrintTypeId == 26)
+            {
+                this.SelShejirenyuan26.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.SelShejileixing26.Value = _eC_OrderBasic.Shejileixing.HasValue ? _eC_OrderBasic.Shejileixing.Value.ToString() : "";
+                this.txtShejiyaoqiu26.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            else  
+            {
+                this.SelShejirenyuan1111.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
+                this.txtShejiyaoqiu1111.Value = _eC_OrderBasic.Shejiyaoqiu;
+            }
+            #endregion
+
         }
 
         /// <summary>
@@ -215,7 +330,65 @@
                 this.selCustormerManagers.DataBind();
                 this.selCustormerManagers.Items.Insert(0, new ListItem("鏃�", "0"));
 
-                
+
+                var oA_Staffs = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 13);
+                this.SelShejirenyuan29.DataSource = oA_Staffs;
+                this.SelShejirenyuan29.DataBind();
+
+                this.SelShejirenyuan6.DataSource = oA_Staffs;
+                this.SelShejirenyuan6.DataBind();
+
+                this.SelShejirenyuanneiye6.DataSource = oA_Staffs;
+                this.SelShejirenyuanneiye6.DataBind();
+
+                this.SelShejirenyuan15.DataSource = oA_Staffs;
+                this.SelShejirenyuan15.DataBind();
+
+                this.SelShejirenyuanneiye15.DataSource = oA_Staffs;
+                this.SelShejirenyuanneiye15.DataBind();
+
+                this.SelShejirenyuan14.DataSource = oA_Staffs;
+                this.SelShejirenyuan14.DataBind();
+
+                this.SelShejirenyuan27.DataSource = oA_Staffs;
+                this.SelShejirenyuan27.DataBind();
+
+                this.SelShejirenyuan21.DataSource = oA_Staffs;
+                this.SelShejirenyuan21.DataBind();
+
+                this.SelShejirenyuan7.DataSource = oA_Staffs;
+                this.SelShejirenyuan7.DataBind();
+
+                this.SelShejirenyuan38.DataSource = oA_Staffs;
+                this.SelShejirenyuan38.DataBind();
+
+                this.SelShejirenyuanneiye38.DataSource = oA_Staffs;
+                this.SelShejirenyuanneiye38.DataBind();
+
+                this.SelShejirenyuan20.DataSource = oA_Staffs;
+                this.SelShejirenyuan20.DataBind();
+
+                this.SelShejirenyuan16.DataSource = oA_Staffs;
+                this.SelShejirenyuan16.DataBind();
+
+                this.SelShejirenyuan22.DataSource = oA_Staffs;
+                this.SelShejirenyuan22.DataBind();
+
+                this.SelShejirenyuan39.DataSource = oA_Staffs;
+                this.SelShejirenyuan39.DataBind();
+
+                this.SelShejirenyuan23.DataSource = oA_Staffs;
+                this.SelShejirenyuan23.DataBind();
+
+                this.SelShejirenyuan25.DataSource = oA_Staffs;
+                this.SelShejirenyuan25.DataBind();
+
+                this.SelShejirenyuan26.DataSource = oA_Staffs;
+                this.SelShejirenyuan26.DataBind();
+
+                this.SelShejirenyuan1111.DataSource = oA_Staffs;
+                this.SelShejirenyuan1111.DataBind();
+
             }
         }
 
@@ -379,6 +552,8 @@
             EC_OrderBasicBLL bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
             EC_OrderExtend eC_OrderExtend = new EC_OrderExtend();//璁㈠崟鎵╁睍淇℃伅
             EC_OrderBasic eC_OrderBasic = new EC_OrderBasic();//璁㈠崟涓昏淇℃伅 
+            OA_StaffBLL oA_StaffBLL = new BLL.OA_StaffBLL();
+            OA_ShejijijianBLL bll_OA_ShejijijianBLLBLL = new OA_ShejijijianBLL();
             EC_OrderPrintParameter orderPrintParameter = null;
             InquiryCommonModel _inquiryCommonModel = null;
             eC_OrderExtend.Keyid = MyConvert.ConvertToInt32(txtKeyid.Value);
@@ -388,6 +563,12 @@
                 if (eC_OrderBasic == null || eC_OrderBasic.Keyid == null)
                 {
                     eC_OrderBasic = new EC_OrderBasic();
+                }
+                if (eC_OrderBasic.ShejiStatus == 1)
+                {
+                    //鎿嶄綔澶辫触
+                    JavaScript.MessageBox("宸蹭笅鍗曪紝涓嶈兘淇敼", this);
+                    return false;
                 }
 
                 eC_OrderExtend.Remark = MyConvert.ConvertToString(Request["txtRemark"]).Trim();
@@ -458,6 +639,481 @@
             eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
             eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
             eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
+
+           var PrintTypeId =  MyConvert.ConvertToInt32(Request["selPrintTypes"]);
+            #region 缁戝畾璁捐淇℃伅 灏侀潰鐨勬暟鍊煎氨鏄�1  鍐呴〉鐨勬暟閲忛渶瑕佽绠楁墍鏈夌殑鍐呴〉椤电爜鐨勬�诲拰
+            if (PrintTypeId == 29)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan29.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing29.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Danshuangmian = this.SelDanshuangmian29.Value;
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu29.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian  =  bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(),"", eC_OrderExtend.Shejileixing.ToString(),null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 6)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan6.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing6.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Danshuangmian = this.SelDanshuangmian6.Value;
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu6.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "1", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+
+                int insidePageNum = 1;
+                if (Request["hidInsidePageNum"] != null)
+                    insidePageNum = Request["hidInsidePageNum"].ToString().ToInt32().Value;
+                int PageNumneiye = 0;
+                for (int i = 1; i <= insidePageNum; i++)
+                {
+                    if (Request["pageNum" + i] != null)
+                        PageNumneiye += Request["pageNum" + i].ToInt32().HasValue ? Request["pageNum" + i].ToInt32().Value : 0;
+                }
+
+
+
+                eC_OrderExtend.Shejicountneiye = PageNumneiye;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuanneiye = this.SelShejirenyuanneiye6.Value.ToInt32();
+                var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye);
+                if (oA_Staff1 != null)
+                {
+                    eC_OrderExtend.ShejirenyuanNameneiye = oA_Staff1.Name;
+                }
+                eC_OrderExtend.Shejileixingneiye = this.SelShejileixingneiye6.Value.ToInt32();
+                eC_OrderExtend.ShejileixingNameneiye = this.shejileixing(eC_OrderExtend.Shejileixingneiye.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiuneiye = this.txtShejiyaoqiuneiye6.Value;
+
+                var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye.ToString(), null).FirstOrDefault();
+                if (shejijijian1 != null)
+                {
+                    eC_OrderExtend.ShejiUnitPriceneiye = shejijijian1.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPriceneiye.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPriceneiye = eC_OrderExtend.ShejiUnitPriceneiye * eC_OrderExtend.Shejicountneiye;
+                    }
+                }
+            }
+            else if (PrintTypeId == 15)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan15.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing15.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Danshuangmian = this.SelDanshuangmian15.Value;
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu15.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "1", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+
+
+
+                int insidePageNum = 1;
+                if (Request["hidInsidePageNum"] != null)
+                    insidePageNum = Request["hidInsidePageNum"].ToString().ToInt32().Value;
+                int PageNumneiye = 0;
+                for (int i = 1; i <= insidePageNum; i++)
+                {
+                    if (Request["pageNum" + i] != null)
+                        PageNumneiye += Request["pageNum" + i].ToInt32().HasValue ? Request["pageNum" + i].ToInt32().Value : 0;
+                }
+                eC_OrderExtend.Shejicountneiye = PageNumneiye;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuanneiye = this.SelShejirenyuanneiye15.Value.ToInt32();
+                var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye);
+                if (oA_Staff1 != null)
+                {
+                    eC_OrderExtend.ShejirenyuanNameneiye = oA_Staff1.Name;
+                }
+                eC_OrderExtend.Shejileixingneiye = this.SelShejileixingneiye15.Value.ToInt32();
+                eC_OrderExtend.ShejileixingNameneiye = this.shejileixing(eC_OrderExtend.Shejileixingneiye.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiuneiye = this.txtShejiyaoqiuneiye15.Value;
+
+                var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye.ToString(), null).FirstOrDefault();
+                if (shejijijian1 != null)
+                {
+                    eC_OrderExtend.ShejiUnitPriceneiye = shejijijian1.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPriceneiye.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPriceneiye = eC_OrderExtend.ShejiUnitPriceneiye * eC_OrderExtend.Shejicountneiye;
+                    }
+                }
+            }
+            else if (PrintTypeId == 14)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan14.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing14.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Danshuangmian = this.SelDanshuangmian14.Value;
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu14.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 27)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan27.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing27.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu27.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 21)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan21.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing21.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu21.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 7)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan7.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing7.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu7.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 38)
+            {
+                eC_OrderExtend.Shejicount = this.ShijuanprintCount.Value.ToInt32() ?? 0;     //Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan38.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.ShejileixingName = this.txtShejileixingName38.Value;
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu38.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "1", "", null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+
+
+
+
+                eC_OrderExtend.Shejicountneiye = this.DatikaprintCount.Value.ToInt32()??0; //Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuanneiye = this.SelShejirenyuanneiye38.Value.ToInt32();
+                var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye);
+                if (oA_Staff1 != null)
+                {
+                    eC_OrderExtend.ShejirenyuanNameneiye = oA_Staff1.Name;
+                }
+                eC_OrderExtend.ShejileixingNameneiye = this.txtShejileixingNameneiye38.Value;
+                eC_OrderExtend.Shejiyaoqiuneiye = this.txtShejiyaoqiuneiye38.Value;
+
+                var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", "", null).FirstOrDefault();
+                if (shejijijian1 != null)
+                {
+                    eC_OrderExtend.ShejiUnitPriceneiye = shejijijian1.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPriceneiye.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPriceneiye = eC_OrderExtend.ShejiUnitPriceneiye * eC_OrderExtend.Shejicountneiye;
+                    }
+                }
+            }
+            else if (PrintTypeId == 20)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan20.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing20.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu20.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 16)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan16.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing16.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu16.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 22)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan22.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing22.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu22.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 39)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan39.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu39.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 23)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan23.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing23.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu23.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 25)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan25.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing25.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu25.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else if (PrintTypeId == 26)
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan26.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejileixing = this.SelShejileixing26.Value.ToInt32();
+                eC_OrderExtend.ShejileixingName = this.shejileixing(eC_OrderExtend.Shejileixing.Value.ToString());
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu26.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", eC_OrderExtend.Shejileixing.ToString(), null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            else 
+            {
+                eC_OrderExtend.Shejicount = 1;// Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan1111.Value.ToInt32();
+                var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
+                if (oA_Staff != null)
+                {
+                    eC_OrderExtend.ShejirenyuanName = oA_Staff.Name;
+                }
+                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu1111.Value;
+                eC_OrderExtend.ShejiStatus = 2;
+
+                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
+                if (shejijijian != null)
+                {
+                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+                    {
+                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+                    }
+                }
+            }
+            #endregion
 
             ///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
             if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
@@ -916,5 +1572,58 @@
                 return "";
             }
         }
+
+
+
+        private string shejileixing(string Shejileixing)
+        {
+            var ShejileixingName = "";
+
+            switch (Shejileixing)
+            {
+                case "1":
+                    ShejileixingName = "鏂囧瓧鐓ф帓";
+                    break;
+                case "2":
+                    ShejileixingName = "鏁撮〉琛ㄦ牸";
+                    break;
+                case "3":
+                    ShejileixingName = "鍗婃枃鍗婅〃";
+                    break;
+                case "4":
+                    ShejileixingName = "鎵弿鐓у仛";
+                    break;
+                case "5":
+                    ShejileixingName = "鏂囦欢淇敼";
+                    break;
+                case "6":
+                    ShejileixingName = "鏂囧瓧灏侀潰";
+                    break;
+                case "7":
+                    ShejileixingName = "璁捐灏侀潰";
+                    break;
+                case "8":
+                    ShejileixingName = "瀹緵鏂囦欢";
+                    break;
+                case "9":
+                    ShejileixingName = "褰╄壊璁捐";
+                    break;
+                case "10":
+                    ShejileixingName = "璁捐鍒朵綔";
+                    break;
+                case "11":
+                    ShejileixingName = "鐓ф帓鍒朵綔";
+                    break;
+                case "12":
+                    ShejileixingName = "璁捐鐓ф帓";
+                    break;
+                default:
+                    ShejileixingName = "";
+                    break;
+            }
+
+            return ShejileixingName;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs
index 58f0a9a..883c144 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs
@@ -168,6 +168,24 @@
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSumPrice;
 
         /// <summary>
+        /// ShijuanprintCount 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden ShijuanprintCount;
+
+        /// <summary>
+        /// DatikaprintCount 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden DatikaprintCount;
+
+        /// <summary>
         /// selVerifyWay 鎺т欢銆�
         /// </summary>
         /// <remarks>
@@ -231,6 +249,537 @@
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtDuiyinghetongbianhao;
 
         /// <summary>
+        /// SelShejirenyuan29 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan29;
+
+        /// <summary>
+        /// SelShejileixing29 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing29;
+
+        /// <summary>
+        /// SelDanshuangmian29 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelDanshuangmian29;
+
+        /// <summary>
+        /// txtShejiyaoqiu29 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu29;
+
+        /// <summary>
+        /// SelShejirenyuan6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan6;
+
+        /// <summary>
+        /// SelShejileixing6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing6;
+
+        /// <summary>
+        /// SelDanshuangmian6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelDanshuangmian6;
+
+        /// <summary>
+        /// txtShejiyaoqiu6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu6;
+
+        /// <summary>
+        /// SelShejirenyuanneiye6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuanneiye6;
+
+        /// <summary>
+        /// SelShejileixingneiye6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixingneiye6;
+
+        /// <summary>
+        /// txtShejiyaoqiuneiye6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye6;
+
+        /// <summary>
+        /// SelShejirenyuan15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan15;
+
+        /// <summary>
+        /// SelShejileixing15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing15;
+
+        /// <summary>
+        /// SelDanshuangmian15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelDanshuangmian15;
+
+        /// <summary>
+        /// txtShejiyaoqiu15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu15;
+
+        /// <summary>
+        /// SelShejirenyuanneiye15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuanneiye15;
+
+        /// <summary>
+        /// SelShejileixingneiye15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixingneiye15;
+
+        /// <summary>
+        /// txtShejiyaoqiuneiye15 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye15;
+
+        /// <summary>
+        /// SelShejirenyuan14 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan14;
+
+        /// <summary>
+        /// SelShejileixing14 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing14;
+
+        /// <summary>
+        /// SelDanshuangmian14 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelDanshuangmian14;
+
+        /// <summary>
+        /// txtShejiyaoqiu14 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu14;
+
+        /// <summary>
+        /// SelShejirenyuan27 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan27;
+
+        /// <summary>
+        /// SelShejileixing27 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing27;
+
+        /// <summary>
+        /// txtShejiyaoqiu27 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu27;
+
+        /// <summary>
+        /// SelShejirenyuan21 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan21;
+
+        /// <summary>
+        /// SelShejileixing21 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing21;
+
+        /// <summary>
+        /// txtShejiyaoqiu21 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu21;
+
+        /// <summary>
+        /// SelShejirenyuan7 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan7;
+
+        /// <summary>
+        /// SelShejileixing7 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing7;
+
+        /// <summary>
+        /// txtShejiyaoqiu7 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu7;
+
+        /// <summary>
+        /// SelShejirenyuan38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan38;
+
+        /// <summary>
+        /// txtShejileixingName38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtShejileixingName38;
+
+        /// <summary>
+        /// txtShejiyaoqiu38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu38;
+
+        /// <summary>
+        /// SelShejirenyuanneiye38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuanneiye38;
+
+        /// <summary>
+        /// txtShejileixingNameneiye38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtShejileixingNameneiye38;
+
+        /// <summary>
+        /// txtShejiyaoqiuneiye38 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye38;
+
+        /// <summary>
+        /// SelShejirenyuan20 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan20;
+
+        /// <summary>
+        /// SelShejileixing20 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing20;
+
+        /// <summary>
+        /// txtShejiyaoqiu20 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu20;
+
+        /// <summary>
+        /// SelShejirenyuan16 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan16;
+
+        /// <summary>
+        /// SelShejileixing16 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing16;
+
+        /// <summary>
+        /// txtShejiyaoqiu16 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu16;
+
+        /// <summary>
+        /// SelShejirenyuan22 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan22;
+
+        /// <summary>
+        /// SelShejileixing22 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing22;
+
+        /// <summary>
+        /// txtShejiyaoqiu22 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu22;
+
+        /// <summary>
+        /// SelShejirenyuan39 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan39;
+
+        /// <summary>
+        /// txtShejiyaoqiu39 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu39;
+
+        /// <summary>
+        /// SelShejirenyuan23 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan23;
+
+        /// <summary>
+        /// SelShejileixing23 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing23;
+
+        /// <summary>
+        /// txtShejiyaoqiu23 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu23;
+
+        /// <summary>
+        /// SelShejirenyuan25 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan25;
+
+        /// <summary>
+        /// SelShejileixing25 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing25;
+
+        /// <summary>
+        /// txtShejiyaoqiu25 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu25;
+
+        /// <summary>
+        /// SelShejirenyuan26 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan26;
+
+        /// <summary>
+        /// SelShejileixing26 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixing26;
+
+        /// <summary>
+        /// txtShejiyaoqiu26 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu26;
+
+        /// <summary>
+        /// SelShejirenyuan1111 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan1111;
+
+        /// <summary>
+        /// txtShejiyaoqiu1111 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiu1111;
+
+        /// <summary>
         /// txtBookNumber 鎺т欢銆�
         /// </summary>
         /// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx
new file mode 100644
index 0000000..2f5a38f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx
@@ -0,0 +1,390 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShejiOrderDeatil.aspx.cs" Inherits="CY.WebForm.Pages.business.ShejiOrderDeatil" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>璁㈠崟璇︽儏</title>
+    <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+    <script src="../../js/common/util.js" type="text/javascript"></script>
+    <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+    <script src="../../js/common/Printter.js" type="text/javascript"></script>
+    <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <!--鍓嶅彴椤甸潰start-->
+    <style type="text/css">
+        .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+        .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+        .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid; }
+        .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
+        .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+        .dbody table td { border-left: 0; padding-left:2px; }
+        .left {text-align: right; }
+        #div_tool { text-align: center; }
+    </style>
+    <script type="text/javascript">
+        window.printBeginCallBack = function () {
+            document.getElementById('hetongchakan').style.display = 'none';
+        };
+        window.printOverCallBack = function () {
+            document.getElementById('hetongchakan').style.display = '';
+        };
+
+        //缁存姢
+        function onViewuplod(keyid) {
+            var l = (screen.availWidth - 500) / 2;
+            var t = (screen.availHeight - 300) / 2;
+           // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+            window.open('/Pages/business/CorporateClientsContractShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l +',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+        }
+
+        $(function () {
+            $("#btnPrint").click(function () {
+                var orderId = $("#hideOrderId").val();
+                $.ajax({
+                    url: '/Pages/business/ShejiOrderDeatil.aspx?tmp' + (new Date()).valueOf(),
+                    type: "POST",
+                    async: false,
+                    data: "Target=print&orderIdStr=" + orderId,
+                    success: function (dataStr) {
+
+                    }
+                });
+            });
+        });
+    </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+    <form id="form1" runat="server">
+    <input type="hidden" runat="server" id="hideOrderId" />
+         <table border="1" cellpadding="0" cellspacing="0" style="border: 0;" id='hetongchakan' >
+              <tr>
+                        <td  >
+<%--                            <span onclick="onViewuplod('<%=BuyerId %>')"   <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>  >鏌ョ湅鍚堝悓 </span>--%>
+                            <input type="button"   <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>   value="鏌ョ湅鍚堝悓" onclick="onViewuplod('<%=BuyerId %>')">
+                        </td>
+                    </tr>
+             </table>
+    <div class='dbody'>
+        <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+            <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+        </object>
+        <div id='div_tool' printparams='0,2100,2970,"A4"'>
+        </div>
+        <table border="1" cellpadding="0" cellspacing="0" style="border: 0;">
+            <asp:Repeater runat="server" ID='rptOrder'>
+                <ItemTemplate>
+                     <tr>
+                        <td colspan='8'>
+                            <div class='dtitle'>
+                                璁捐璁㈠崟:<%#Eval("SellerOrderId")%></div>
+                             
+                            <style type="text/css">
+                                #tr_PrintModeName { display: <%#0.Equals(Eval("OrderTypeId"))? "1" : "" %>none; }
+                            </style>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan='8'>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            涓氬姟绫诲埆锛�
+                        </td>
+                        <td>
+                            <%#Eval("PrintType.PrintName")%>
+                        </td>
+                        <td class='left'>
+                            鍒跺崟鏃堕棿锛�
+                        </td>
+                        <td>
+                            <%#Eval("CreateTime","{0:yyyy-MM-dd HH:mm:ss}")%>
+                        </td>
+                        <td class='left'>
+                            鍒跺崟浜猴細
+                        </td>
+                        <td>
+                            <%#Eval("Creater")%>
+                        </td>
+                        <td class='left'>
+                            绱ф�ョ▼搴︼細
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.ExigencyCase.Name")%>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan='8'>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <th colspan='8'>
+                            鍩烘湰淇℃伅
+                        </th>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            璁㈠崟鍙凤細
+                        </td>
+                        <td>
+                            <%#Eval("SellerOrderId")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            鍗颁欢鍚嶇О锛�
+                        </td>
+                        <td>
+                            <%#Eval("DocumentName")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            璁㈠崟绫诲瀷锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderType.Name")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            浜よ揣鏃堕棿锛�
+                        </td>
+                        <td>
+                            <%#Eval("DeliveryTime","{0:yyyy-MM-dd}")%>&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            瀹㈡埛绾у埆锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.CustomerLevel.Name")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            瀹㈡埛鍚嶇О锛�
+                        </td>
+                        <td>
+                            <%#Eval("BuyerName")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            涓氬姟缁忕悊锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.BusinessManager.Name")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            瀹㈡埛缁忕悊锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.CustomerManager.Name")%>&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            鏁伴噺锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.PrintNum")%>&nbsp;<%#Eval("UnitName")%>
+                        </td>
+                        <td class='left'>
+                            鍗曚环锛�
+                        </td>
+                        <td>
+                            <%#(Eval("UnitPrice")==null)||(string.IsNullOrEmpty(Eval("UnitPrice").ToString()))?"":"锟�"%><%#Eval("UnitPrice","{0:F2}")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            璁㈠崟鎬婚锛�
+                        </td>
+                        <td colspan="3">
+                            锟�<%#Eval("SumPrice","{0:F2}")%>&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            鏍$鏂瑰紡锛�
+                        </td>
+                        <td>
+                            <%#Eval("OrderExtend.ProofreadWay.Name")%>&nbsp;
+                        </td>
+                        <td class='left'>
+                            鏂囦欢鍚嶏細
+                        </td>
+                        <td>
+                            &nbsp;
+                        </td>
+                        <td class='left'>
+                            鎺ヤ欢鏃堕棿锛�
+                        </td>
+                        <td colspan="3">
+                            &nbsp;
+                        </td>
+                    </tr>
+                </ItemTemplate>
+            </asp:Repeater>
+            <asp:Repeater ID='rptInquiryCommon' runat="server">
+                <ItemTemplate>
+                    <tr>
+                        <td colspan='8'>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <th colspan='8'>
+                            鍗板埛璇︽儏
+                        </th>
+                    </tr>
+                    <tr id='tr_PrintModeName'>
+                        <td class='left'>
+                            鍗板埛鏂瑰紡锛�
+                        </td>
+                        <td colspan='7'>
+                            <%#Eval("PrintModeName")%>&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            鍗板埛瑕佹眰锛�
+                        </td>
+                        <td colspan='7'>
+                            <asp:Label ID="lblPrintDemand" Text='<%#Eval("PrintDemand")%>' runat="server" Width="650px"></asp:Label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            鍚庨亾宸ュ簭锛�
+                        </td>
+                        <td colspan='7'>
+                            <asp:Label ID="lblAfterWorksDemand" Text='<%#Eval("AfterWorksDemand")%>' runat="server" Width="650px"></asp:Label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'>
+                            浜よ揣鏂瑰紡锛�
+                        </td>
+                        <td>
+                            <%#Eval("DeliveryModeName")%>&nbsp;
+                        </td>
+                        <td class="left">
+                            绁ㄦ嵁锛�
+                        </td>
+                        <td colspan="5">
+                            <%#Eval("BillModeName")%>&nbsp;
+                        </td>
+                    </tr>
+                </ItemTemplate>
+            </asp:Repeater>
+            <asp:Repeater ID='rptAccpteWay' runat="server">
+                <ItemTemplate>
+                    <div style='border: 0; display: <%#104.Equals(Eval("AcceptTypeId"))?"none":""%>'>
+                        <tr>
+                            <td class='left'>
+                                鍩�&#12288;&#12288;甯傦細
+                            </td>
+                            <td>
+                                <%#Eval("City")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鏀惰揣浜猴細
+                            </td>
+                            <td>
+                                <%#Eval("Accepter")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鑱旂郴鐢佃瘽锛�
+                            </td>
+                            <td colspan="3">
+                                <%#Eval("AccepterPhone")%>&nbsp;
+                            </td>
+                        </tr>
+                        <tr style='display: <%#106.Equals(Eval("AcceptTypeId"))?"":"none"%>'>
+                            <td class='left'>
+                                閫佽揣鍦板潃锛�
+                            </td>
+                            <td colspan='7'>
+                                <%#Eval("AccepterAddress")%>&nbsp;
+                            </td>
+                        </tr>
+                        <tr style='display: <%#107.Equals(Eval("AcceptTypeId"))?"":"none"%>'>
+                            <td class='left'>
+                                璐ц繍鍏徃锛�
+                            </td>
+                            <td colspan='7'>
+                                <%#Eval("AppointCourierCompany")%>&nbsp;
+                            </td>
+                        </tr>
+                        <tr style='display: <%#107.Equals(Eval("AcceptTypeId"))?"":"none"%>'>
+                            <td class='left'>
+                                鏀惰揣鐐瑰湴鍧�锛�
+                            </td>
+                            <td>
+                                <%#Eval("AccepterAddress")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鐢�&#12288;&#12288;璇濓細
+                            </td>
+                            <td>
+                                <%#Eval("AccepterPhoneNum")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鑱旂郴浜猴細
+                            </td>
+                            <td colspan="3">
+                                <%#Eval("AcceptContacts")%>&nbsp;
+                            </td>
+                        </tr>
+                        <tr style='display: <%#107.Equals(Eval("AcceptTypeId"))?"":"none"%>'>
+                            <td class='left'>
+                                鍙栬揣鐐瑰湴鍧�锛�
+                            </td>
+                            <td>
+                                <%#Eval("FetchAddress")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鐢�&#12288;&#12288;璇濓細
+                            </td>
+                            <td>
+                                <%#Eval("FetchPhoneNum")%>&nbsp;
+                            </td>
+                            <td class='left'>
+                                鑱旂郴浜猴細
+                            </td>
+                            <td colspan="3">
+                                <%#Eval("FetchContacts")%>&nbsp;
+                            </td>
+                        </tr>
+                        <tr>
+                        <td class='left'>
+                           姣忓寘鏁伴噺锛�
+                        </td>
+                        <td>
+                            <%#Eval("NumPerBag")%>&nbsp;
+                        </td>
+                        <td class="left">
+                            鎬诲寘鏁帮細
+                        </td>
+                        <td colspan="5">
+                            <%#Eval("BagNum")%>&nbsp;
+                        </td>
+                    </tr>
+                    </div>
+                </ItemTemplate>
+            </asp:Repeater>
+              <tr>
+                <td class='left'>
+                    鍗板埛銆佹墦鍖呫�侀�佽揣瑕佹眰锛�
+                </td>
+                <td colspan="7">
+                    <asp:Label ID="lblPrintPackDeliveryRequir" runat="server" Width="600px"></asp:Label>
+                </td>
+            </tr>
+            <tr>
+                <td class='left'>
+                    澶�&#12288;&#12288;娉細
+                </td>
+                <td colspan="7">
+                    <asp:Label ID="lblRemark" runat="server" Width="600px"></asp:Label>
+                </td>
+            </tr>
+        </table>
+        <uc:CMSMergerOrder ID="CMSMergerOrder1" runat="server" />
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs
new file mode 100644
index 0000000..425b026
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs
@@ -0,0 +1,222 @@
+锘�/**  
+* ShejiOrderDeatil.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟璇︽儏
+* 绫� 鍚嶏細 ShejiOrderDeatil
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-24 13:25      鍚村磶鍧�    鍒濈増
+* V0.02  2013-5-15 18:23      鍚村磶鍧�    缂栬緫鐣岄潰鏍峰紡
+* V0.03  2013-5-15 15:58      鍚村磶鍧�    瀹屾垚鏁版嵁鑾峰彇
+* V0.04  2013-5-21 14:38      鍚村磶鍧�    澧炲姞璁㈠崟杩涘害
+* V0.05  2013-5-23 9:33       鍚村磶鍧�    淇敼缁ф壙绫讳负榛樿绫籔age浣挎樉绀轰俊鎭笉鍙楃櫥褰曟帶鍒�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+using CY.SQLDAL;
+using System.Data.SqlClient;
+
+namespace CY.WebForm.Pages.business
+{
+    /// <summary>
+    /// 璁㈠崟璇︽儏
+    /// </summary>
+    public partial class ShejiOrderDeatil : BasePage
+    {
+        EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+        Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+        public int ContractCount = 0;
+        public string BuyerId = "";
+        /// <summary>
+        /// 椤甸潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                switch (Request["Target"])
+                {
+                    case "GetCommunication":
+                        break;
+                    case "print":
+                        int orderId = Request["orderIdStr"].ToString().ToInt32().Value;
+                        UpdatePrintState(orderId);
+                        break;
+                    case "Printfengqian":
+                        int orderIds = Request["orderIdStr"].ToString().ToInt32().Value;
+                        UpdatePrintfengqianState(orderIds);
+                        break;
+                    default:
+                        Page_Load_Default();
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                Response.Write("-1");
+            }
+            Response.End();
+        }
+
+        /// <summary>
+        /// 榛樿鍔犺浇浜嬩欢鏂规硶
+        /// </summary>
+        private void Page_Load_Default()
+        {
+            LoadOrderInfo();
+        }
+
+        /// <summary>
+        /// 鍔犺浇璁㈠崟淇℃伅
+        /// </summary>
+        private bool LoadOrderInfo()
+        {
+            string orderIdStr = Request["orderId"];
+            this.hideOrderId.Value = orderIdStr;
+            if (string.IsNullOrEmpty(orderIdStr))
+            {
+                CY.WebForm.BasePage.JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
+                return false;
+            }
+            int? orderId = MyConvert.ConvertToInt32(orderIdStr);
+            if (!orderId.HasValue)
+            {
+                CY.WebForm.BasePage.JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
+                return false;
+            }
+
+            EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+            if (null == _eC_OrderBasic)
+            {
+                CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+                return false;
+            }
+            //if (CurrentUser.MemberId!=Guid.Parse(UtilConst.AdminFirmId)&&_eC_OrderBasic.BuyerId != CurrentUser.MemberId && _eC_OrderBasic.SellerId != CurrentUser.MemberId)
+            //{
+            //    CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+            //    return false;
+            //}
+            EC_AcceptWayByOrderBLL _eC_AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+            EC_AcceptWayByOrder _eC_AcceptWayByOrder = _eC_AcceptWayByOrderBLL.GetModelByTargetId(orderId.Value);
+            if (null == _eC_AcceptWayByOrder)
+            {
+                CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+                return false;
+            }
+
+            _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
+            _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
+
+            EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
+            InquiryCommonModel _inquiryCommonModel = null;
+            if (null == _eC_OrderPrintParameter)
+            {
+                _inquiryCommonModel = new InquiryCommonModel();
+            }
+            else
+            {
+                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            }
+            Sys_DictionaryBLL sys_DictionaryBLL = new Sys_DictionaryBLL();
+            _inquiryCommonModel.DeliveryModeName = sys_DictionaryBLL.GetModelByKeyid(_eC_AcceptWayByOrder.AcceptTypeId);
+            _inquiryCommonModel.BillModeName = _eC_AcceptWayByOrder.InvoiceDemand;
+            if (_inquiryCommonModel.PrintTypeId == 13)
+            {
+                _inquiryCommonModel.PrintDemand = _inquiryCommonModel.PrintCountName + "锛�" + _inquiryCommonModel.PrintDemand;
+            }
+            var sys_Dictionarie = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").FirstOrDefault(x=>x.MeanValue == _inquiryCommonModel.Unit);
+            if (sys_Dictionarie != null)
+            {
+                _eC_OrderBasic.UnitName = sys_Dictionarie.Name;
+            }
+            BuyerId = _eC_OrderBasic.BuyerId.ToString();
+            //鏌ヨ瀹㈡埛鏄惁鏈夊悎鍚�
+            Database DC = new Database();
+            try
+            {
+
+                string sqlStr = string.Format("select  count(*) from [dbo].[OA_CorporateClientContract] where CorporateClientsid='{0}'", _eC_OrderBasic.BuyerId);
+                SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+                ContractCount = (int)myCmd.ExecuteScalar();
+            }
+            catch (Exception)
+            {
+
+                ContractCount = 0;
+            }
+            finally
+            {
+                if (DC.Connection.State != System.Data.ConnectionState.Closed)
+                    DC.Connection.Close();
+            }
+
+
+            rptOrder.DataSource = new List<EC_OrderBasic>() { _eC_OrderBasic };
+            rptOrder.DataBind();
+            rptAccpteWay.DataSource = "鑷彁".Equals(_inquiryCommonModel.DeliveryModeName) ? null : new List<EC_AcceptWayByOrder>() { _eC_AcceptWayByOrder };
+            rptAccpteWay.DataBind();
+            rptInquiryCommon.DataSource = new List<InquiryCommonModel>() { _inquiryCommonModel };
+            rptInquiryCommon.DataBind();
+
+            this.lblRemark.Text = _eC_OrderBasic.Remark;
+            this.lblPrintPackDeliveryRequir.Text = _eC_OrderBasic.PrintPackDeliveryRequir; 
+            return true;
+        }
+
+        /// <summary>
+        /// 鏀瑰彉鎵撳嵃鐘舵��
+        /// </summary>
+        private void UpdatePrintState(int orderId)
+        {
+            EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId);
+            if (CurrentUser != null)
+            {
+                var originalGuid = CurrentUser.MemberId;
+                Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
+                //褰撴槸鍗栧鏃舵敼鍙樻墦鍗扮姸鎬�
+                if (reversedGuid == _eC_OrderBasic.SellerId)
+                {
+                    _eC_OrderBasicBLL.UpdatePrintState(orderId);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 鏀瑰彉鎵撳嵃灏佺鐘舵��
+        /// </summary>
+        private void UpdatePrintfengqianState(int orderId)
+        {
+             
+            if (CurrentUser != null)
+            {
+                
+                    _eC_OrderBasicBLL.UpdatePrintfengqianState(orderId);
+                 
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.designer.cs
new file mode 100644
index 0000000..b16c7fa
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.designer.cs
@@ -0,0 +1,98 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class ShejiOrderDeatil
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// hideOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+        /// <summary>
+        /// rptOrder 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptOrder;
+
+        /// <summary>
+        /// rptInquiryCommon 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptInquiryCommon;
+
+        /// <summary>
+        /// rptAccpteWay 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptAccpteWay;
+
+        /// <summary>
+        /// lblPrintPackDeliveryRequir 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPrintPackDeliveryRequir;
+
+        /// <summary>
+        /// lblRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblRemark;
+
+        /// <summary>
+        /// CMSMergerOrder1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSMergerOrder CMSMergerOrder1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
new file mode 100644
index 0000000..0ee730f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
@@ -0,0 +1,549 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShejiOrderList.aspx.cs" Inherits="CY.WebForm.Pages.business.ShejiOrderList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>璁㈠崟鍒楄〃</title>
+    <uc:cmshead id="CMSHead1" runat="server" />
+    <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
+    <script type="text/javascript">
+        //璁㈠崟璇勪环
+        function evaluationModel(orderid) {
+            dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
+        }
+
+        function OpenComplainan(orderId, orderCode, firmId) {
+            var url = "/Pages/business/ComplainanEdit.aspx?orderId=" + orderId;
+            url += "&orderCode=" + orderCode;
+            url += "&firmId=" + firmId;
+            url += "&type=1";
+            top.Dialog.open({ URL: url, Title: "鏂板鎶曡瘔" });
+        }
+
+        function OpenVisit(orderId, orderCode, buyerName) {
+            var url = "/Pages/business/BackVisitNoteEdit.aspx?id=" + orderId;
+            url += "&orderId=" + orderCode;
+            url += "&buyerName=" + buyerName;
+            top.Dialog.open({ URL: url, Title: "璁㈠崟鍥炶", Height: 400 });
+        }
+
+        function toXiadan(orderId) {
+            var url = "/Pages/business/ShejiOrderxiadan.aspx?Keyid=" + orderId;
+            top.Dialog.open({ URL: url, Title: "涓嬪崟", Height: 600, Width: 800 });
+        }
+
+        function ToBatchxiadan() {
+          
+            var jsonObj = undefined;
+            var ids = '';
+            var cks = $("input[name='ckId']:checked");
+
+            if (cks.length == 0) { alertMsg('鍙湁鏈笅鍗曠殑璁㈠崟鍙笅鍗曪紝鏈�変腑锛�'); return; } else { }
+
+            cks.each(function (d) {
+
+                try {
+                    jsonObj = eval('[' + this.value + ']')[0];
+                } catch (ex) {
+                    global.DealDataException(ex); return;
+                }
+
+                
+                ids += ',' + jsonObj.id;
+
+
+
+            });
+
+            
+
+
+            var url = "/Pages/business/ShejiOrderxiadan.aspx?Keyid=" + ids;
+            top.Dialog.open({ URL: url, Title: "涓嬪崟", Height: 600, Width: 800 });
+        }
+
+        function CompledWork(orderId) {
+            var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
+            top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
+        }
+
+        function ShowOrderFengqian(orderId) {
+            top.Dialog.open({ URL: "/Pages/business/AgSealPrint.aspx?orderid=" + orderId, Title: "鎵撳嵃灏佺", Width: 1100, Height: 900 });
+        }
+
+
+        function ShowPlanOrder(orderId) {
+            top.Dialog.open({ URL: "/Pages/business/PlanShejiOrderList.aspx?orderkeyid=" + orderId, Title: "璁″垝璁㈠崟", Width: 1100, Height: 900 });
+        }
+
+
+        /*
+鏄剧ず璁㈠崟
+*/
+        function ShowOrderOrder(id) {
+            OpenSmallWindowByUrlUseSize("/Pages/business/ShejiOrderDeatil.aspx?orderId=" + id, 850, 800);
+        }
+
+        function DeliverWork(orderId, orderCode, orderState) {
+            var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;
+            url += "&OrderShowId=" + orderCode;
+            url += "&OrderState=" + orderState;
+            top.Dialog.open({ URL: url, Title: "閫佽揣", Height: 450, Width: 680 });
+        }
+
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function View(personId) {
+            top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+        }
+
+        //涓嬭浇鏂囦欢
+        function onDownLoad(keyid) {
+            top.Dialog.confirm("纭畾瑕佷笅杞芥枃浠讹紵", function () {
+                window.location = "/Pages/business/ShejiOrderList.aspx?downId=" + keyid;
+            });
+        }
+
+        $(function () {
+            $(".td_hide").find("span").hide();
+            $(".td_hide").find("span").each(
+                function () {
+                    var value = $.trim($(this).text());
+                    var classValue = $(this).attr("class");
+                    if (value == '鈭�') {
+                        $(this).show();
+                    }
+                    if (classValue == "hand_yes") {
+                        $(this).show();
+                    }
+                    if (classValue == "hand_no") {
+                        $(this).removeAttr("onclick");
+                    }
+                }
+            );
+
+            $(".td_hide").hover(function () {
+                $(this).find("span").each(
+                    function () {
+                        var value = $.trim($(this).text());
+                        var classValue = $(this).attr("class");
+                        if (value == '鈭�') {
+
+                        }
+                        else {
+                            if (classValue == "hand_no") {
+                            }
+                            else {
+                                $(this).show();
+                            }
+                        }
+                    }
+                );
+            }, function () {
+                $(this).find("span").each(
+                    function () {
+                        var value = $.trim($(this).text());
+                        var classValue = $(this).attr("class");
+                        if (value == '鈭�') {
+                        }
+                        else {
+                            if (classValue == "hand_yes") {
+                                $(this).show();
+                            }
+                            else {
+                                $(this).hide();
+                            }
+                        }
+                    }
+                );
+            });
+
+            $(".edit").each(
+                function () {
+                    var hideOrderState = $(this).next().val();
+                    var hideOrderType = $(this).next().next().val();
+                    var orderState = parseInt(hideOrderState);
+                    var orderType = parseInt(hideOrderType);
+                    if (orderState >= 4 || orderState <= 0 || orderType > 1) {
+                        $(this).removeClass("a_under");
+                        $(this).removeAttr("onclick");
+                    }
+                }
+            );
+        });
+
+
+
+
+        /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+        function ToWaixieFukuan() {
+
+            var ids = '';
+            var ordernos = '';
+            var cks = $("input[name='ckId']:checked");
+            if (cks.length == 0) {
+                alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+                return;
+            }
+            else {
+            }
+            
+
+           
+
+            cks.each(
+                function () {
+                    var ckVal = $(this).val();
+
+                    var ckValJson = eval('(' + ckVal + ')');
+                   
+                    ids = ids + ',' + ckValJson.id;
+                    ordernos = ordernos + ',' + ckValJson.orderId;
+                   
+
+                }
+            );
+            
+
+           
+          
+                
+
+            kaipiaoConfirm(ids, ordernos);
+                //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+                //top.Dialog.confirm(msg, function () {
+                //    DoAcceptAll3(ids);
+                //});
+            
+        }
+        function kaipiaoConfirm(orderId,orderno) {
+            var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
+            top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
+        }
+
+
+
+
+        function showProgress() {
+            document.getElementById('progressBar').style.display = 'block';
+           
+          
+                setTimeout(function () {
+                    document.getElementById('progressBar').style.display = 'none';
+                }, 5000); // 10000姣绛変簬10绉�
+          
+        }
+
+
+        /*
+纭鎵归噺鍒犻櫎
+*/
+        function ToBatchdelete(operateFn, validateFn) {
+            var canntDeleteobjs = new Array();
+            var jsonObj = undefined;
+            var ids = '';
+            var cks = $("input[name='ckId']:checked");
+
+            if (cks.length == 0) { alertMsg('鍙湁鏈笅鍗曠殑璁㈠崟鍙垹闄わ紝鏈�変腑锛�'); return; } else { }
+
+            cks.each(function (d) {
+
+                try {
+                    jsonObj = eval('[' + this.value + ']')[0];
+                } catch (ex) {
+                    global.DealDataException(ex); return;
+                }
+               
+                if (jsonObj.shejiStatus == "1") {
+                    canntDeleteobjs[canntDeleteobjs.length] = this;
+                }
+                ids += ',' + jsonObj.id;
+
+              
+
+            });
+
+            //鏈変笉鍙垹闄ょ殑鏁版嵁
+            if (canntDeleteobjs.length > 0) {
+                alertMsg('鍙湁鏈笅鍗曡鍗曞彲鍒犻櫎锛�');
+                return;
+                //window.dialog.confirm('鍙湁鏈笅鍗曡鍗曞彲鍒犻櫎锛岃闂槸鍚︽帓闄や笉鑳藉垹闄ょ殑璁㈠崟骞剁户缁搷浣滐紵', function () {
+                //    setTimeout(function () {
+                //        clearSelected(canntDeleteobjs); //娓呴櫎閫変腑鐨勪笉鍙垹闄ゆ暟鎹�
+                //        ToBatch(operateFn, validateFn); //閲嶆柊鎵ц鑷繁
+                //    }, 0);
+                //});
+            }
+            else if (operateFn) {
+                window.dialog.confirm('鏄惁纭褰撳墠鎿嶄綔锛�', function () {
+                    {
+
+                        operateFn(ids.substring(1));
+
+                    }
+                });
+            }
+            else { alertMsg('璋冪敤閿欒锛佸繀椤讳紶鍏ヨ杩涜鐨勬搷浣滐紒'); }
+        }
+
+    </script>
+    <style type="text/css">
+        .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+        .tableStyleXS td { padding: 1px 0 1px 3px; }
+        .TableNewStyle select { width: 80px; }
+        .td_hide span { text-decoration: default; display: none; text-align: center; }
+        span.hand_no { cursor: default; display: block; font-size: 12px; }
+        span.hand_no:hover { text-decoration: none; }
+        span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+        .td_hide { cursor: pointer; }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent" style="width: auto;">
+        <div class="box1">
+            <table class="TableNewStyle" style="width: 100%;">
+                <tr>
+                    <td class="ali03">
+                        涓嬪崟鏃堕棿锛�
+                    </td>
+                    <td style="width: 215px">
+                        <input id="txtBeginData" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+                    </td>
+                    <td class="ali03">
+                        璁㈠崟缂栧彿锛�
+                    </td>
+                    <td>
+                        <input id='txtOrderId' runat="server" maxlength='25' />
+                    </td>
+                    <td class="ali03">
+                        璁㈠崟绫诲瀷锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' class=' firstfocus' id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid">
+                        </select>
+                    </td>
+                   <td class="ali03">
+                        涓氬姟缁忕悊锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+                        </select>
+                    </td>
+
+                    <td class="ali03">
+                        璁捐浜哄憳锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selShejirenyuan' runat="server"  datavaluefield="Keyid" datatextfield='Name'>
+                        </select>
+                    </td>
+                    
+                </tr>
+                
+                <tr>
+
+                     <td class="ali03">
+                        瀹㈡埛鍚嶇О锛�
+                    </td>
+                    <td>
+                        <input id='txtBuyerName' runat="server" maxlength='50' />
+                    </td>
+
+
+                    <td class="ali03">
+                        鍗颁欢鍚嶇О锛�
+                    </td>
+                    <td>
+                        <input id='txtDocumentName' runat="server" maxlength='50' />
+                    </td>
+
+ 
+                    <td class="ali03">
+                        鏄惁涓嬪崟锛�
+                    </td>
+                    <td>
+                        <asp:dropdownlist keepdefaultstyle='true' id="selShejiStatus" runat="server">
+                            <asp:listitem value="">鍏ㄩ儴</asp:listitem>
+                            <asp:listitem value="1">鏄�</asp:listitem>
+                            <asp:listitem value="2">鍚�</asp:listitem>
+                        </asp:dropdownlist>
+                    </td>
+                          <td colspan="4">
+                        <asp:button id="btn_Search" text="鏌ヨ" runat="server" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+                           <asp:Button ID="Button1" Text="瀵煎嚭" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
+                        <div id="progressBar" style="display:none; position:fixed; top:50%; left:50%; transform:translate(-50%, -50%);border:1px solid black;height:50px;background-color:azure;">
+    姝e湪瀵煎嚭Excel鏂囦欢锛岃绋嶅��...
+</div>
+                        <input type="hidden" id='txtCommission' runat="server" />
+                    </td>             
+                </tr>
+                 
+            </table>
+        </div>
+        <div class="box_tool_min">
+            <div class="center" style=" margin-left:0px;">
+                <div class="left">
+                    <div class="right">
+                        <div class="padding_top5 padding_left10">
+                            <a href="javascript:;" onclick="window.location='ShejiOrderEdit.aspx';" menu_member_case_id="case_addOrder" menu_member_case_name="鏂板璁㈠崟" class='newadd' id='link_new'><span class="icon_add">鏂板璁㈠崟</span></a>
+                            <div class="box_tool_line">
+                            </div>
+                            <a href="javascript:;" class='delete' menu_member_case_id="case_deleteOrderList" menu_member_case_name="鎵归噺鍒犻櫎" onclick="ToBatchdelete(BatchDelete,IsObjCanntDelete);"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>
+                            <div class="box_tool_line">
+                            </div>
+                             <a href="javascript:;"   menu_member_case_id="case_xiadanOrderList" menu_member_case_name="鎵归噺涓嬪崟" onclick="ToBatchxiadan();"><span class="icon_edit">鎵归噺涓嬪崟</span></a>
+
+                            <div class="clear">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="clear">
+            </div>
+        </div>
+        <div clear="fl">
+            <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+                <thead>
+                    <tr>
+                        <th width="25">
+                        </th>
+                        <th width="25">
+                            缂栧彿
+                        </th>
+                        <th style="text-align: center;" width="70">
+                            璁㈠崟鍙�
+                        </th>
+                        <th style="text-align: center;">
+                            瀹㈡埛鍗曚綅
+                        </th>
+                        <th width="55">
+                            涓氬姟缁忕悊
+                        </th>
+                        <th width="55">
+                            璁㈠崟绫诲瀷
+                        </th>
+                         
+                        <th style="text-align: center;">
+                            鍗颁欢鍚嶇О
+                        </th>
+                         <th width="36">
+                            鍐呴〉椤电爜
+                        </th>
+                        <th width="36">
+                            鍗板埛鏁伴噺
+                        </th>
+                        <th width="60">
+                            鍗曚环
+                        </th>
+                        
+                        <th width="60">
+                            閲戦
+                        </th>
+                        <th width="240">
+                            璁捐鎻愭垚
+                        </th>
+                        <th width="26">
+                            杩涘害
+                        </th>
+                       <th width="26" menu_member_case_id="case_Dayang" menu_member_case_name="鎵撴牱">
+                            鎵撴牱
+                        </th>
+                       
+                      
+                         <th width="26"  menu_member_case_id="case_Xiadan" menu_member_case_name="涓嬪崟">
+                            涓嬪崟
+                        </th>
+                         <th width="26" menu_member_case_id="case_PrintOrder" menu_member_case_name="鎵撳嵃">
+                            鎵撳嵃
+                        </th>
+                         
+                    </tr>
+                </thead>
+                <tbody>
+                    <asp:repeater id="rptData" runat="server">
+                        <itemtemplate>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+                                    id:<%#Eval("Keyid")%>,
+                                    buyerId:'<%#Eval("BuyerId")%>',
+                                         shejiStatus:'<%#Eval("ShejiStatus")%>' 
+                                    }" id='ckBox<%#Container.ItemIndex%>'   class='ckBox' />
+                                </td>
+                                <td>
+                                    <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+                                </td>
+                                <td style="text-align: center;"> 
+                                    <span class="edit a_under" <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"title=''":"title='鐐瑰嚮淇敼璁㈠崟'" %> onclick="window.location='ShejiOrderEdit.aspx?Target=ToUpSetData&orderId=<%#Eval("Keyid") %>';">
+                                        <%#Eval("SellerOrderId")%></span> 
+                                    
+                                </td>
+                                <td style="text-align: center;">
+                                 <div style="word-wrap: break-word; text-align:justify;">
+                                    <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
+                                        </div>
+                                </td>
+                                <td> 
+                                    <%#Eval("BusinessManager")%>
+                                </td>
+                                <td style="text-align: center;">
+                                    <%#Eval("PrintType.PrintName")%>
+                                </td>
+                             
+                                <td style="text-align: center;">
+                                <span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >22? (Eval("DocumentName").ToString().Substring(0,22)+".."):Eval("DocumentName").ToString() %></span>
+                                </td>
+
+                                 <td>
+                                    <%#Eval("Shejicountneiyename") %>
+                                </td>
+                                
+                                    <td>
+                                    <%#Eval("OrderExtend.PrintNum")%>
+                                </td>
+                                      
+                                 
+                             
+                                <td>
+                                    <%#Eval("UnitPrice","{0:F}")%>
+                                </td>
+                                <td>
+                                    <%#Eval("SumPrice", "{0:F}")%>
+                                </td>
+                                  <td>
+                                    <%#Eval("Shejiticheng")%>
+                                </td>
+                                 <td>
+ 
+                                </td>
+
+                                 <td    menu_member_case_id="case_Dayang" menu_member_case_name="鎵撴牱" >
+ 
+                                </td>
+                                  <td   menu_member_case_id="case_Xiadan" menu_member_case_name="涓嬪崟" >
+ 
+                                       <span class="edit a_under" <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"title=''":"title='鐐瑰嚮涓嬪崟' onclick=\"toXiadan( '"+ Eval("Keyid") +"')\"" %> >
+                                         <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"宸蹭笅鍗�":"涓嬪崟" %> </span> 
+                                </td>
+                               
+                                <td class="td_hide" menu_member_case_id="case_PrintOrder" menu_member_case_name="鎵撳嵃">
+                                    <%-- <span class="hand look" title="鏌ョ湅鎴栨墦鍗�" onclick='ShowOrder(<%#Eval("Keyid") %>)'>鎵撳嵃</span>--%>
+                                    <span class="hand_yes" <%#true.Equals(Eval("IsPrint"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrderOrder(<%#Eval("Keyid") %>)'>
+                                        <%#true.Equals(Eval("IsPrint")) ? "鈭�" : "鎵撳嵃"%></span>
+                                </td>
+                                
+                            </tr>
+                        </itemtemplate>
+                    </asp:repeater>
+                </tbody>
+            </table>
+            <uc:ucpager id="UCPager1" runat="server" />
+        </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs
new file mode 100644
index 0000000..d35cd0f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs
@@ -0,0 +1,706 @@
+锘�/**  
+* OrderList.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderList
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-5-6 9:16        鍚村磶鍧�    鍒濈増
+* V0.02  2013-5-6 18:02       鍚村磶鍧�    瀹屾垚鍒嗛〉鏌ヨ  
+* V0.03  2013-5-7 17:28       鍚村磶鍧�    澧炲姞璁㈠崟鐘舵�佽缃�(缃负锛氱敓浜с�佸畬鎴�)骞跺姞涓婁互闄愬埗(濡�:绾夸笂璁㈠崟涓嶅彲缃负瀹屾垚)銆�
+*                                       澧炲姞鎵归噺鍒犻櫎骞朵簣浠ラ檺鍒�(鍙兘鍒犻櫎鏈彈鐞嗙殑鍘傚晢鏂板璁㈠崟)銆�
+*                                       澧炲姞鍙楃悊鎿嶄綔骞跺姞浠ラ檺鍒�(鍙湁鏈彈鐞嗙殑璁㈠崟鎵嶈兘鍙楃悊)
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.BLL.Sys;
+using CY.Infrastructure.Common;
+using CY.BLL;
+using CY.WebForm.Pages.common;
+using System.IO;
+using CY.Infrastructure.Query;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+
+namespace CY.WebForm.Pages.business
+{
+    /// <summary>
+    /// 璁㈠崟鍒楄〃鐣岄潰绫�
+    /// </summary>
+    public partial class ShejiOrderList : BasePage
+    {
+
+        EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
+        LF_OrderFileBLL _lF_OrderFileBLL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        public ShejiOrderList()
+        {
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            bll_OA_StaffBLL = new OA_StaffBLL();
+            _lF_OrderFileBLL = new LF_OrderFileBLL();
+        }
+
+        /// <summary>
+        /// 鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                if (Request["isSession"] != null)
+                {
+                    if (!IsPostBack && !IsCallback)
+                        Session["ShejiOrderList"] = null;
+                }
+                if (Request["downId"] != null)
+                {
+                    int iDownId = Convert.ToInt32(Request["downId"]);
+                    LF_OrderFile model = _lF_OrderFileBLL.GetModel(iDownId);
+                    model.FileState = 1;
+                    _lF_OrderFileBLL.UpdateModel(model);
+                    string fileName = "";//瀹㈡埛绔繚瀛樼殑鏂囦欢鍚�
+                    string filePath = "";//璺緞
+                    if (model != null)
+                    {
+                        fileName = model.FileName;//瀹㈡埛绔繚瀛樼殑鏂囦欢鍚�
+                        filePath = model.FilePath;//璺緞
+                    }
+                    else
+                    {
+                        JavaScript.MessageBox("鏂囦欢涓嶅瓨鍦�", this);
+                        return;
+                    }
+                    System.IO.FileInfo fileInfo = new System.IO.FileInfo(filePath);
+                    if (fileInfo.Exists == true)
+                    {
+                        const long ChunkSize = 102400;//100K 姣忔璇诲彇鏂囦欢锛屽彧璇诲彇100K锛岃繖鏍峰彲浠ョ紦瑙f湇鍔″櫒鐨勫帇鍔�
+                        byte[] buffer = new byte[ChunkSize];
+                        Response.Clear();
+                        System.IO.FileStream iStream = System.IO.File.OpenRead(filePath);
+                        long dataLengthToRead = iStream.Length;//鑾峰彇涓嬭浇鐨勬枃浠舵�诲ぇ灏�
+                        Response.ContentType = "application/octet-stream";
+                        Response.AddHeader("Content-Disposition", "attachment; filename=" + HttpUtility.UrlEncode(fileName));
+                        while (dataLengthToRead > 0 && Response.IsClientConnected)
+                        {
+                            int lengthRead = iStream.Read(buffer, 0, Convert.ToInt32(ChunkSize));//璇诲彇鐨勫ぇ灏�
+                            Response.OutputStream.Write(buffer, 0, lengthRead);
+                            Response.Flush();
+                            dataLengthToRead = dataLengthToRead - lengthRead;
+                        }
+                        Response.Close();
+                    }
+                    Response.Redirect("/Pages/business/ShejiOrderList.aspx");
+                    return;
+                }
+                switch (Request["Target"])
+                {
+                    case "AcceptOrder":
+                        Accept();
+                        break;
+                    case "SuodanOrder":
+                        Suodan();
+                        break;
+                    case "AcceptOrderAll":
+                        AcceptAll();
+                        break;
+                    case "ChangeState":
+                        //ChangeOrderState();
+                        break;
+                    case "BatchDelete":
+                        CY.WebForm.cs.WebUtil.DeleteData(_eC_OrderBasicBLL.DeleteDataByIds, CurrentUser.ShortName);//璋冪敤閫氱敤鍒犻櫎鏂规硶
+                        break;
+                    case "BatchToOver":
+                        UpdataState(-1);//璁剧疆鐘舵�佷负瀹屾垚(涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "BatchToProduction":
+                        //UpdataState(3);//璁剧疆鐘舵�佷负鐢熶骇涓�(涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "BatchToSend":
+                        UpdataState(4);//璁剧疆鐘舵�佷负宸插畬宸� (涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "ToAccountDelay":
+                        Delay(1);//璇锋眰鎵撴寤舵湡
+                        break;
+                    case "DeliveryDelay":
+                        Delay(2);//璇锋眰浜よ揣寤舵湡
+                        break;
+                    case "OrderRepeal":
+                        Delay(3);//璇锋眰鎾ゅ崟
+                        break;
+                    case "ReplyRequest"://绛斿璁㈠崟璇锋眰
+                        RequestReply();
+                        break;
+                    case "RetireOrderBySeller": //鍗栧鐩存帴鎾ゅ崟锛屾垨鑰�
+                        RetireOrderBySeller();
+                        break;
+                    case "CanPrintAwb":
+                        CanPrintAwb();
+                        break;
+                    default:
+                        Page_Load_Default();
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                //Response.Write("鍙傛暟閿欒");
+                Response.Write(ex.Message);
+            }
+            Response.End();
+        }
+
+        /// <summary>
+        /// 鍒ゆ柇鏄惁鍙互鎵归噺鎵撳嵃閫佽揣鍗�
+        /// </summary>
+        public void CanPrintAwb()
+        {
+            EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+           
+            string orderIds = Request["orderIds"].ToString();
+            string[] orderIdArry = orderIds.Split(',');
+            bool IsFirst = true;
+            string firstAccepterAddress = string.Empty;
+            string result = string.Empty;
+            string jsonStr = "IsCan:'true'";
+            string msg = "鍙湁閫佽揣涓婇棬涓旈�佽揣鍦板潃鐩稿悓鐨勮鍗曟墠鑳芥墦鍗伴�佽揣鍗�";
+            Guid? DeliveryOrderId = Guid.Empty;
+            foreach (string orderIdStr in orderIdArry)
+            {
+                int orderId = orderIdStr.ToInt32().Value;
+                EC_AcceptWayByOrder model = _AcceptWayByOrderBLL.GetModelByTargetId(orderId);
+                EC_OrderBasic eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId);
+                if (model == null)
+                    continue;
+                if (IsFirst)
+                {
+                    firstAccepterAddress = model.AccepterAddress.Trim();
+                    DeliveryOrderId = eC_OrderBasic.DeliveryOrderId;
+                }
+                if (model.AcceptTypeId.Value != 106)
+                {
+                    jsonStr = "IsCan:'false',Msg:'" + msg + "'";
+                    break;
+                }
+                if (model.AccepterAddress.Trim() != firstAccepterAddress)
+                {
+                    jsonStr = "IsCan:'false',Msg:'" + msg + "'";
+                    break;
+                }
+                if (!eC_OrderBasic.DeliveryOrderId.Equals(DeliveryOrderId))
+                {
+                    jsonStr = "IsCan:'false',Msg:'璁㈠崟灞炰簬涓嶅悓鐨勯�佽揣鍗曪紒'";
+                    break;
+                }
+
+                IsFirst = false;
+            }
+            result = "{" + jsonStr + "}";
+            Response.Write(result);
+        }
+
+        /// <summary>
+        /// 鏇存柊鐘舵��
+        /// </summary>
+        private void UpdataState(int stateId)
+        {
+            Response.Clear();
+            if (1 == stateId || 2 == stateId)
+            {
+                HttpContext.Current.Response.Write(-2);
+                return;
+            }
+            string paramValue = HttpContext.Current.Request["ids"];
+            //string stateStr=HttpContext.Current.Request["state"];
+            string remark = string.Format("{0}", Request["remark"]);
+            int? tempId;
+            //tempId = string.IsNullOrEmpty(stateStr)?null:MyConvert.ConvertToInt32(stateStr);
+            if (string.IsNullOrEmpty(paramValue)/*||!tempId.HasValue*/)
+            {
+                HttpContext.Current.Response.Write(-2);
+                return;
+            }
+            else
+            {
+            }
+
+            //int stateId=tempId.Value;
+            string[] splitResult = paramValue.Split(',');
+            int i = -1;
+
+            List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+            while (++i < splitResult.Length)
+            {
+                tempId = MyConvert.ConvertToInt32(splitResult[i]);
+                if (!tempId.HasValue)
+                {
+                    HttpContext.Current.Response.Write(-2);
+                    return;
+                }
+                else
+                {
+                }
+                oprates.Add(new EC_OrderOperate()
+                {
+                    OperateType = stateId,
+                    OrderId = tempId.Value,
+                    Operator = CurrentUser.ShortName,
+                    Remark = remark
+                });
+            }
+            HttpContext.Current.Response.Write((_eC_OrderBasicBLL.UpdateOrderState(oprates.ToArray()) ? 1 : 0));
+        }
+
+        /// <summary>
+        /// 鍙楃悊璁㈠崟(鍏ㄩ儴璁㈠崟鍙楃悊)
+        /// </summary>
+        private void Accept()
+        {
+            Response.Clear();
+            PayAbout payAbout = new PayAbout();
+            payAbout.LoadNewestPaymentAccount(true);
+            double? commission = MyConvert.ConvertToDouble(CY.Config.WebInfo.Instance.FirmOrderAgencyFee);
+            int? orderId = string.IsNullOrEmpty(Request["id"]) ? null : MyConvert.ConvertToInt32(Request["id"]);
+            if (!orderId.HasValue || !commission.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.AcceptOrder(orderId.Value, commission.Value) ? "1" : "0");
+        }
+
+
+        /// <summary>
+        /// 閿佸崟
+        /// </summary>
+        private void Suodan()
+        {
+            Response.Clear();
+            int? orderId = string.IsNullOrEmpty(Request["id"]) ? null : MyConvert.ConvertToInt32(Request["id"]);
+            if (!orderId.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.SuodingOrder(orderId.Value, CurrentUser.ShortName) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鎵归噺鍙楃悊璁㈠崟
+        /// </summary>
+        public void AcceptAll()
+        {
+            Response.Clear();
+            PayAbout payAbout = new PayAbout();
+            payAbout.LoadNewestPaymentAccount(true);
+            double? commission = MyConvert.ConvertToDouble(CY.Config.WebInfo.Instance.FirmOrderAgencyFee);
+            string orderIds = string.Empty;
+            ;
+            if (Request["ids"] != null)
+            {
+                orderIds = Request["ids"].ToString();
+            }
+            if (string.IsNullOrEmpty(orderIds) || !commission.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.AcceptOrderAll(orderIds, commission.Value) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鏀瑰彉璁㈠崟鐘舵��(鏆傛椂涓嶅惎鐢�)
+        /// </summary>
+        private void ChangeOrderState()
+        {
+            Response.Clear();
+            string idsStr = Request["ids"];
+            string stateIdStr = Request["stateId"];
+            string remark = string.Format("{0}", Request["remark"]);
+            int? stateId = string.IsNullOrEmpty(stateIdStr) ? null : MyConvert.ConvertToInt32(stateIdStr);
+            if (string.IsNullOrEmpty(idsStr) || !stateId.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            string[] ids = idsStr.Split(',');
+
+            int i = -1;
+            int? tempId = null;
+            List<EC_OrderOperate> operaters = new List<EC_OrderOperate>();
+            while (++i < ids.Length)
+            {
+                tempId = string.IsNullOrEmpty(ids[i]) ? null : MyConvert.ConvertToInt32(ids[i]);
+                if (!tempId.HasValue)
+                {
+                    operaters = null;
+                    break;
+                }
+                else
+                {
+                }
+                operaters.Add(new EC_OrderOperate()
+                {
+                    OrderId = tempId.Value,
+                    Operator = CurrentUser.ShortName,
+                    OperateType = stateId.Value,
+                    Remark = remark
+                });
+            }
+            if (null == operaters)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.UpdateOrderState(operaters.ToArray()) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鍗栧閫�鍗�
+        /// </summary>
+        public void RetireOrderBySeller()
+        {
+            string orderidStr = Request["orderid"];
+            string tovalueStr = Request["tovalue"];
+
+            int orderId = orderidStr.ToInt32().Value;
+            decimal retireMony = tovalueStr.ToDecimal2().Value;
+            string operatorName = CurrentUser.ShortName;
+            Response.Write(_eC_OrderBasicBLL.RetireOrderBySeller(orderId, retireMony, operatorName));
+        }
+
+        /// <summary>
+        /// 璇锋眰寤舵湡
+        /// </summary>
+        /// <param name="typeId">璇锋眰绫诲瀷</param>
+        private void Delay(int typeId)
+        {
+            Response.Clear();
+            string receiverStr = Request["receiver"];
+            string orderidStr = Request["orderid"];
+            string tovalueStr = Request["tovalue"];
+            if (string.IsNullOrEmpty(receiverStr) || string.IsNullOrEmpty(orderidStr) || string.IsNullOrEmpty(tovalueStr))
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+
+            int? orderid = MyConvert.ConvertToInt32(orderidStr);
+            int? tovalue = MyConvert.ConvertToInt32(tovalueStr);
+            Guid receiver = MyConvert.ConvertToGuid(receiverStr);
+            if (Guid.Empty == receiver || !orderid.HasValue || !tovalue.HasValue)
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+            EC_OrderDialogue _eC_OrderDialogue = new EC_OrderDialogue();
+            _eC_OrderDialogue.ReceiverId = receiver;
+            _eC_OrderDialogue.TargetOrder = orderid;
+            _eC_OrderDialogue.TargetValue = tovalue;
+            _eC_OrderDialogue.DialogueTypeId = typeId;
+            _eC_OrderDialogue.InitiatorId = CurrentUser.MemberId;
+            _eC_OrderDialogue.DialogueContent = string.Format("{0}", Request["dialoguecontent"]);
+            //寮�濮嬭姹�
+            Response.Write(_eC_OrderBasicBLL.OrderPropertyChangeRequest(_eC_OrderDialogue));
+        }
+
+        /// <summary>
+        /// 绛斿娓呭崟璇锋眰 
+        /// </summary>
+        private void RequestReply()
+        {
+            Response.Clear();
+            string ridStr = Request["did"];
+            string isAllowStr = Request["isAllow"];
+            Guid rid = MyConvert.ConvertToGuid(ridStr);
+            bool? isAllow = Convert.ToBoolean(isAllowStr);
+            if (Guid.Empty == rid || !isAllow.HasValue)
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.OrderPropertyChangeReply(rid, CurrentUser.MemberId, isAllow.Value));
+        }
+
+        /// <summary>
+        /// 榛樿鎵ц鏂规硶
+        /// </summary>
+        private void Page_Load_Default()
+        {
+            UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
+            btn_Search.Click += btn_Search_Click;
+            txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
+            //List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
+
+
+            if (!IsPostBack && !IsCallback)
+            {
+                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+                SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+
+                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModles();
+                this.selPrintTypes.DataBind();
+                this.selPrintTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+                this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+
+                this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+                this.selBusinessManager.DataTextField = "Name";
+                this.selBusinessManager.DataValueField = "Keyid";
+                this.selBusinessManager.DataBind();
+                this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                this.selShejirenyuan.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 13); ;
+                this.selShejirenyuan.DataBind();
+                this.selShejirenyuan.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                
+
+                this.txtBeginData.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+                this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+                //鍒濇鏁版嵁鍔犺浇
+                btn_Search_Click(btn_Search, new EventArgs());
+            }
+        }
+
+        #region 鏌ヨ
+
+        /// <summary>
+        /// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btn_Search_Click(object sender, EventArgs e)
+        {
+            Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+           
+           
+
+            UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
+            //鍐嶆鏌ヨ
+            AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
+        }
+
+         
+
+        /// <summary>               
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AspNetPager_PageChanged(object sender, EventArgs e)
+        {
+            //UCPager1.AspNetPager.PageSize = 3;
+
+            Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+            {
+                PageSize = UCPager1.AspNetPager.PageSize,
+                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
+            };
+            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPageSheji(pagination, CurrentUser.MemberId,this.txtBeginData.Value,this.txtEndDate.Value,this.txtOrderId.Value
+                ,this.selPrintTypes.Value,this.selBusinessManager.Value,this.selShejirenyuan.Value,this.txtBuyerName.Value,this.txtDocumentName.Value,this.selShejiStatus.SelectedValue);
+
+            foreach (var eC_OrderBasic in result)
+            {
+                if(eC_OrderBasic.BusinessManagerId.HasValue && eC_OrderBasic.BusinessManagerId.Value > 0)
+                {
+                    var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(eC_OrderBasic.BusinessManagerId);
+                    if (oA_Staff != null)
+                    {
+                        eC_OrderBasic.BusinessManager = oA_Staff.Name;
+                    }
+                }
+
+                eC_OrderBasic.Shejiticheng = eC_OrderBasic.ShejirenyuanName + eC_OrderBasic.Shejicount + "*" + (eC_OrderBasic.ShejiUnitPrice.HasValue? eC_OrderBasic.ShejiUnitPrice.Value.ToString("G29"):"0") + "=" + (eC_OrderBasic.ShejiSumPrice.HasValue ? eC_OrderBasic.ShejiSumPrice.Value.ToString("G29") : "0");
+                if (eC_OrderBasic.PrintTypeId == 6 || eC_OrderBasic.PrintTypeId == 15 || eC_OrderBasic.PrintTypeId == 38)
+                {
+                    eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + (eC_OrderBasic.ShejiUnitPriceneiye.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye.HasValue ? eC_OrderBasic.ShejiSumPriceneiye.Value.ToString("G29") : "0");
+                }
+                eC_OrderBasic.Shejicountneiyename = (eC_OrderBasic.Shejicountneiye.HasValue && eC_OrderBasic.Shejicountneiye.Value > 0) ? eC_OrderBasic.Shejicountneiye.Value.ToString() : "";
+            }
+            rptData.DataSource = result;
+            rptData.DataBind();
+
+            UCPager1.AspNetPager.RecordCount = pagination.RecordCount;
+        }
+
+      
+       
+
+        //鏌ヨ浜嬩欢
+        protected void btn_Daochu_Click(object src, EventArgs e)
+        {
+
+            byte[] fileBytes = ExportToExcel();
+            if (fileBytes != null)
+            {
+                Response.Clear();
+                Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+                Response.AppendHeader("Content-Disposition", "attachment; filename=璁㈠崟瀵煎嚭.xlsx");
+                Response.BinaryWrite(fileBytes);
+                Response.End();
+            }
+            else
+            {
+                // 澶勭悊瀵煎嚭澶辫触鐨勬儏鍐�
+                Response.Write("瀵煎嚭澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+            }
+
+        }
+
+        public byte[] ExportToExcel()
+        {
+            byte[] bt = null;
+            try
+            {
+                Pagination pa = new Pagination();
+                pa.PageSize = 500;
+                pa.PageIndex = 1;
+
+              
+
+                var  result = _eC_OrderBasicBLL.SelectModelPageSheji(pa, CurrentUser.MemberId, this.txtBeginData.Value, this.txtEndDate.Value, this.txtOrderId.Value
+                , this.selPrintTypes.Value, this.selBusinessManager.Value, this.selShejirenyuan.Value, this.txtBuyerName.Value, this.txtDocumentName.Value, this.selShejiStatus.SelectedValue);
+
+                foreach (var eC_OrderBasic in result)
+                {
+                    if (eC_OrderBasic.BusinessManagerId.HasValue && eC_OrderBasic.BusinessManagerId.Value > 0)
+                    {
+                        var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(eC_OrderBasic.BusinessManagerId);
+                        if (oA_Staff != null)
+                        {
+                            eC_OrderBasic.BusinessManager = oA_Staff.Name;
+                        }
+                    }
+                    eC_OrderBasic.Shejiticheng = eC_OrderBasic.ShejirenyuanName + eC_OrderBasic.Shejicount + "*" + eC_OrderBasic.ShejiUnitPrice + "=" + eC_OrderBasic.ShejiSumPrice;
+                    if (eC_OrderBasic.PrintTypeId == 6 || eC_OrderBasic.PrintTypeId == 15 || eC_OrderBasic.PrintTypeId == 38)
+                    {
+                        eC_OrderBasic.Shejiticheng += " " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + eC_OrderBasic.ShejiUnitPriceneiye + "=" + eC_OrderBasic.ShejiSumPriceneiye;
+                    }
+                    eC_OrderBasic.Shejicountneiyename = (eC_OrderBasic.Shejicountneiye.HasValue && eC_OrderBasic.Shejicountneiye.Value > 0) ? eC_OrderBasic.Shejicountneiye.Value.ToString() : "";
+
+
+                }
+
+
+                // 鍒涘缓宸ヤ綔绨�
+                IWorkbook workbook = new XSSFWorkbook();
+                ISheet sheet = workbook.CreateSheet("瀵煎嚭鏁版嵁");
+
+                // 鍒涘缓琛ㄥご
+                IRow headerRow = sheet.CreateRow(0);
+                headerRow.CreateCell(0).SetCellValue("缂栧彿");
+                headerRow.CreateCell(1).SetCellValue("璁㈠崟鍙�");
+                headerRow.CreateCell(2).SetCellValue("瀹㈡埛鍗曚綅");
+                headerRow.CreateCell(3).SetCellValue("涓氬姟缁忕悊");
+                headerRow.CreateCell(4).SetCellValue("璁㈠崟绫诲瀷");
+                headerRow.CreateCell(5).SetCellValue("鍗颁欢鍚嶇О");
+                headerRow.CreateCell(6).SetCellValue("鍐呴〉椤电爜");
+                headerRow.CreateCell(7).SetCellValue("鍗板埛鏁伴噺");
+                headerRow.CreateCell(8).SetCellValue("鍗曚环");
+                headerRow.CreateCell(9).SetCellValue("閲戦");
+                headerRow.CreateCell(10).SetCellValue("璁捐鎻愭垚");
+              
+
+                // 娣诲姞鏁版嵁
+                int rowIndex = 1;
+                foreach (var order in result)
+                {
+                    IRow row = sheet.CreateRow(rowIndex++);
+                    row.CreateCell(0).SetCellValue((rowIndex - 1).ToString());
+                    row.CreateCell(1).SetCellValue(order.SellerOrderId);
+                    row.CreateCell(2).SetCellValue(order.BuyerName);
+                    row.CreateCell(3).SetCellValue(order.BusinessManager);
+                    row.CreateCell(4).SetCellValue(order.PrintType.PrintName);
+                    row.CreateCell(5).SetCellValue(order.DocumentName);
+                    row.CreateCell(6).SetCellValue((order.Shejicountneiye.HasValue&& order.Shejicountneiye.Value>0) ? order.Shejicountneiye.Value.ToString() : "");
+                    row.CreateCell(7).SetCellValue(order.OrderExtend.PrintNum.HasValue ? order.OrderExtend.PrintNum.Value : 0);
+                    row.CreateCell(8).SetCellValue(order.UnitPrice.HasValue ? order.UnitPrice.Value.ToDouble2().Value : 0);
+                    row.CreateCell(9).SetCellValue(order.SumPrice.HasValue ? order.SumPrice.Value.ToDouble2().Value : 0);
+                    row.CreateCell(10).SetCellValue(order.Shejiticheng);
+
+
+
+
+
+
+                }
+
+                // 灏嗗伐浣滅翱鍐欏叆鍐呭瓨娴�
+                using (var ms = new MemoryStream())
+                {
+                    workbook.Write(ms);
+                    bt = ms.ToArray();
+                }
+            }
+            catch (Exception e)
+            {
+                bt = null;
+                // 璁板綍鏃ュ織
+
+            }
+            return bt;
+        }
+
+        /// <summary>
+        /// 鏄惁宸茬粡鎿嶄綔
+        /// </summary>
+        /// <param name="keyid"></param>
+        /// <param name="orderState"></param>
+        /// <param name="opType"></param>
+        /// <returns></returns>
+        public bool IsOpearted(object keyidObj, object orderStateObj, object opTypeObj)
+        {
+            int keyid = (int)keyidObj;
+            int orderState = (int)orderStateObj;
+            string opType = (string)opTypeObj;
+            return _eC_OrderBasicBLL.IsOpearted(keyid, orderState, opType);
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs
new file mode 100644
index 0000000..aafcc9e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs
@@ -0,0 +1,170 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class ShejiOrderList
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// txtBeginData 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
+
+        /// <summary>
+        /// txtEndDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+        /// <summary>
+        /// txtOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
+
+        /// <summary>
+        /// selPrintTypes 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
+
+        /// <summary>
+        /// selBusinessManager 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+        /// <summary>
+        /// selShejirenyuan 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selShejirenyuan;
+
+        /// <summary>
+        /// txtBuyerName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+
+        /// <summary>
+        /// txtDocumentName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtDocumentName;
+
+        /// <summary>
+        /// selShejiStatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList selShejiStatus;
+
+        /// <summary>
+        /// btn_Search 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Search;
+
+        /// <summary>
+        /// Button1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button Button1;
+
+        /// <summary>
+        /// txtCommission 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
+
+        /// <summary>
+        /// rptData 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptData;
+
+        /// <summary>
+        /// UCPager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx
new file mode 100644
index 0000000..2f86e99
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx
@@ -0,0 +1,17 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShejiOrderxiadan.aspx.cs" Inherits="CY.WebForm.Pages.business.ShejiOrderxiadan" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>涓嬪崟</title>
+    <uc:CMSHead ID="CMSHead1" runat="server" />
+     <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+   
+</head>
+<body>
+    <form id="form1" runat="server">
+      </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs
new file mode 100644
index 0000000..c1026f6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs
@@ -0,0 +1,108 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.business
+{
+    public partial class ShejiOrderxiadan : BasePage
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string Keyid = Request["Keyid"].ToString();
+
+               var orderids = Keyid.Trim(',').Split(',');
+
+                if(orderids == null || orderids.Length == 0)
+                {
+                    JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this, true, false);
+                    return;
+                }
+                EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+                EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+                EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();//瀹炰緥鍖栬鍗曚笟鍔℃搷浣滃璞�
+                var eC_OrderBasics = new List<EC_OrderBasic>();
+                foreach (var orderid in orderids)
+                {
+                    var _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderid.ToInt32().Value);
+                    if(_eC_OrderBasic.ShejiStatus == 1)
+                    {
+                        JavaScript.MessageBox(_eC_OrderBasic.SellerOrderId + "宸蹭笅鍗曠殑璁㈠崟涓嶈兘閲嶅涓嬪崟锛�", this,true, false);
+                        return;
+                    }
+                    eC_OrderBasics.Add(_eC_OrderBasic);
+                }
+                using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+   new TransactionOptions
+   {
+       IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+       Timeout = TransactionManager.MaximumTimeout
+   }
+   )
+            )
+                {
+                    try
+                    {
+                        //寮�濮嬩笅鍗�
+                        foreach (var eC_OrderBasic in eC_OrderBasics)
+                        {
+                            var resul = _eC_OrderBasicBLL.UpShejiStatus(eC_OrderBasic.Keyid.Value, 1, CurrentUser.ShortName);
+
+                            if (resul)
+                            {
+                                var eC_OrderExtend = _eC_OrderBasicBLL.GetModelByKeyid(eC_OrderBasic.Keyid.Value);
+                                eC_OrderExtend.ShejiStatus = eC_OrderBasic.Keyid.Value;
+                                var acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(eC_OrderBasic.Keyid.Value);
+                                var pay_TradingSingle = _eC_OrderBasicBLL.GetPayTradingById(eC_OrderBasic.Keyid.Value);
+
+                                eC_OrderBasic.SellerId = CurrentUser.MemberId;
+                                eC_OrderBasic.Creater = CurrentUser.ShortName;
+                                eC_OrderBasic.CreateTime = DateTime.Now;
+                                eC_OrderBasic.Operator = CurrentUser.ShortName;
+                                eC_OrderBasic.LastUpdateTime = DateTime.Now;
+                                eC_OrderBasic.AcceptWayByOrder = acceptWayByOrder;
+                                // InquiryCommonModel _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), ) as InquiryCommonModel;
+                                // PayAbout.NewOrder(eC_OrderBasic, eC_OrderExtend, _inquiryCommonModel);
+                                var eC_OrderPrint = new EC_OrderPrintParameter();
+                                eC_OrderPrint.PrintParameter = eC_OrderBasic.PrintParameter;
+                                bool isWin = eC_OrderBLL.NewOrderpiliang(eC_OrderBasic, eC_OrderExtend, pay_TradingSingle, acceptWayByOrder, null, 0, 0, eC_OrderPrint);
+                            }
+
+                        }
+
+
+                        scope.Complete();
+                        JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
+                    }
+                    catch (Exception ex)
+                    {
+
+                        PAGEHandleException(ex);
+                        JavaScript.MessageBox("鎿嶄綔澶辫触", this, true, false);
+                    }
+                    finally
+                    {
+                        // 閲婃斁璧勬簮
+                        scope.Dispose();
+                    }
+
+                }
+
+
+
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.designer.cs
new file mode 100644
index 0000000..ec91d52
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.designer.cs
@@ -0,0 +1,44 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class ShejiOrderxiadan
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
index 6520536..663cbb1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
@@ -20,7 +20,14 @@
                  $('#selFengmianneiyetr').show();
                  $('#selFengmianneiye').val(Fengmianneiye);
                  Fengmianneiyechange();
-             } else {
+             }
+             else if ($('#selDingdanleixing').val() == "38") {
+                 $('#selFengmianneiye').html(' <option  value="1">璇曞嵎鐓ф帓</option><option  value="2">绛旈鍗$収鎺�</option>');
+                 $('#selFengmianneiyetr').show();
+                 $('#selFengmianneiye').val(Fengmianneiye);
+                 Fengmianneiyechange();
+             }
+             else {
                  $('#selFengmianneiye').html('<option value="">璇烽�夋嫨</option>');
                  $('#selFengmianneiyetr').hide();
                  $('#selFengmianneiye').val("");
@@ -84,6 +91,10 @@
                  else if ($('#selFengmianneiye').val() == "2") {
                      $('#selShejileixing').html('<option  value="2">鏁撮〉琛ㄦ牸</option> <option  value="3">鍗婃枃鍗婅〃</option><option  value="9">褰╄壊璁捐</option> <option  value="4">鎵弿鐓у仛</option> <option  value="5">鏂囦欢淇敼</option><option  value="8">瀹緵鏂囦欢</option>');
                  }
+             } else if ($('#selDingdanleixing').val() == "38") {
+                
+                 $('#selShejileixing').html('<option value="">璇烽�夋嫨</option>');
+                
              }
          }
         
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx.cs
index b185d8f..19e9b75 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx.cs
@@ -87,24 +87,51 @@
             }
 
             m_OA_CarDictionary.Dingdanleixing = this.selDingdanleixing.Value;
-            var sysInquiry_Printing =  _sysInquiry_PrintingTypeBLL.GetModelById(m_OA_CarDictionary.Dingdanleixing.ToInt32().Value);
-            if (sysInquiry_Printing != null)
+            if (m_OA_CarDictionary.Dingdanleixing == "-1")
             {
-                m_OA_CarDictionary.DingdanleixingName = sysInquiry_Printing.PrintName;
+                m_OA_CarDictionary.DingdanleixingName = "鍏朵粬";
             }
+            else
+            {
+                var sysInquiry_Printing = _sysInquiry_PrintingTypeBLL.GetModelById(m_OA_CarDictionary.Dingdanleixing.ToInt32().Value);
+                if (sysInquiry_Printing != null)
+                {
+                    m_OA_CarDictionary.DingdanleixingName = sysInquiry_Printing.PrintName;
+                }
+            }
+           
             m_OA_CarDictionary.Fengmianneiye = this.selFengmianneiye.Value;
-            switch (m_OA_CarDictionary.Fengmianneiye)
+            if(m_OA_CarDictionary.Dingdanleixing == "38")
             {
-                case "1":
-                    m_OA_CarDictionary.FengmianneiyeName = "灏侀潰璁捐";
-                    break;
-                case "2":
-                    m_OA_CarDictionary.FengmianneiyeName = "鍐呴〉璁捐";
-                    break;
-                default:
-                    m_OA_CarDictionary.FengmianneiyeName = "";
-                    break;
+                switch (m_OA_CarDictionary.Fengmianneiye)
+                {
+                    case "1":
+                        m_OA_CarDictionary.FengmianneiyeName = "璇曞嵎鐓ф帓";
+                        break;
+                    case "2":
+                        m_OA_CarDictionary.FengmianneiyeName = "绛旈鍗$収鎺�";
+                        break;
+                    default:
+                        m_OA_CarDictionary.FengmianneiyeName = "";
+                        break;
+                }
             }
+            else
+            {
+                switch (m_OA_CarDictionary.Fengmianneiye)
+                {
+                    case "1":
+                        m_OA_CarDictionary.FengmianneiyeName = "灏侀潰璁捐";
+                        break;
+                    case "2":
+                        m_OA_CarDictionary.FengmianneiyeName = "鍐呴〉璁捐";
+                        break;
+                    default:
+                        m_OA_CarDictionary.FengmianneiyeName = "";
+                        break;
+                }
+            }
+         
 
 
             m_OA_CarDictionary.Shejileixing = this.selShejileixing.Value;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
index 7fc8bed..d755302 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -7,7 +7,7 @@
     <title>涓嶅共鑳惰浠�</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1' />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;width: 150px;">
-                    鍗板埛灏哄锛堥暱脳瀹斤級
+                    鎴愬搧灏哄锛堥暱脳瀹斤級
                 </th>
                 <th style="text-align: center;width: 150px;">
                     褰㈢姸
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index 9334be0..84fb603 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -7,7 +7,7 @@
     <title>榛戠櫧鍗颁欢璇环</title>
 </head>
 <body>
-     <table class="table2">
+     <table class="table2"  style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1' />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0'  checked="true" />涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx
index 7802f70..cd82b54 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx
@@ -12,7 +12,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     鍗板埛鏉愯川
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx.designer.cs
index 6e7de5d..08b24cf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BusinessCard.aspx.designer.cs
@@ -2,14 +2,16 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.front {
-    
-    
-    public partial class BusinessCard {
+namespace CY.WebForm.Pages.front
+{
+
+
+    public partial class BusinessCard
+    {
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
index b4786e2..67f21c2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
@@ -12,7 +12,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
index 3d9869e..385b5f7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -7,7 +7,7 @@
     <title>DM鍗曡浠�</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;">
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1'id="hebanyinshua" /><label for="hebanyinshua">鍚堢増鍗板埛</label>&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true"  id="zhuanbanyinshua"/><label for="zhuanbanyinshua">涓撶増鍗板埛</label></th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;width:20%">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx
index 47cb9db..1dc2bf3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx
@@ -24,7 +24,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     鍗板埛绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx.designer.cs
index 8a83a63..4d66ba4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DigitalSingle.aspx.designer.cs
@@ -2,14 +2,16 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.front {
-    
-    
-    public partial class DigitalSingle {
+namespace CY.WebForm.Pages.front
+{
+
+
+    public partial class DigitalSingle
+    {
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
index b765db4..b4e576e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
@@ -7,7 +7,7 @@
     <title>淇″皝璇环</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1'  />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
index d7813a0..5ae82dc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
@@ -12,7 +12,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     鐗堟暟
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
index d2fa6d8..e909931 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
@@ -7,7 +7,7 @@
     <title>渚跨璇环</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1'  />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true"/>涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
index c90ad2a..c040d88 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
@@ -17,7 +17,7 @@
             </tr>
             <tr>
                 <td align="right" style="width: 100px;">
-                    鍗板埛灏哄锛�
+                    鎴愬搧灏哄锛�
                 </td>
                 <td align="left" style="width: 161px;">
                     <input id="printSizeName" name="printSizeName" runat="server" type="text" class="textinput" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx
index bd3e4d3..7e98c0e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx
@@ -15,7 +15,7 @@
                     绫诲埆
                 </th>
                 <th style="text-align: center;">
-                   鍗板埛灏哄
+                   鎴愬搧灏哄
                 </th>
                 <%--<th style="text-align: center;">
                    鍘氬害 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx.designer.cs
index 0c9f5aa..2b48eff 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PVCCard.aspx.designer.cs
@@ -2,14 +2,16 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.front {
-    
-    
-    public partial class PVCCard {
+namespace CY.WebForm.Pages.front
+{
+
+
+    public partial class PVCCard
+    {
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
index 41e770b..2f2b616 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
@@ -7,7 +7,7 @@
     <title>灏佸璇环</title>
 </head>
 <body>
-     <table class="table2">
+     <table class="table2" style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1'  />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 88fe66a..e3a679c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -7,7 +7,7 @@
     <title>鐢诲唽璇环</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;">
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1'  />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx
index b618b87..7ca5815 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx
@@ -15,7 +15,7 @@
                     绫诲埆
                 </th>
                 <th style="text-align: center;">
-                   鍗板埛灏哄
+                   鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                    鍗板埛鏁伴噺  
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx.designer.cs
index 278be4d..6ea76cc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PortraitCard.aspx.designer.cs
@@ -2,14 +2,16 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.front {
-    
-    
-    public partial class PortraitCard {
+namespace CY.WebForm.Pages.front
+{
+
+
+    public partial class PortraitCard
+    {
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index 1647727..f687a72 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -41,7 +41,7 @@
        </script>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;">
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡:&nbsp<input type="radio" name="printMode" value='1'  />鍚堢増&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true" />涓撶増</th>
@@ -52,7 +52,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
index 923f62a..33dec78 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -7,7 +7,7 @@
     <title>鎵嬫彁琚嬭浠�</title>
 </head>
 <body>
-    <table class="table2">
+    <table class="table2" style="display:none;" >
         <tbody>
             <tr>
                 <th>璇烽�夋嫨鍗板埛鏂瑰紡锛�&nbsp<input type="radio" name="printMode" value='1' />鍚堢増鍗板埛&nbsp;&nbsp<input type="radio" name="printMode" value='0' checked="true"  />涓撶増鍗板埛</th>
@@ -18,7 +18,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     绾稿紶
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
index 3314bc6..faf57a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
@@ -12,7 +12,7 @@
         <tbody>
             <tr>
                 <th style="text-align: center;">
-                    鍗板埛灏哄
+                    鎴愬搧灏哄
                 </th>
                 <th style="text-align: center;">
                     鍗板埛鏁伴噺
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
index de053fa..2b64909 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -198,47 +198,51 @@
                     {
                         res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
 
-                        if (res && m_OA_WorkPlan.PlanDataType == 15)
+                        if (res )
                         {
-                            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
-                            var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
-
-                          
-                            //闇�瑕佸垹闄ょ殑闄勪欢
-                            var oA_WorkPlan_Attachments = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(m_OA_WorkPlan.Keyid.Value, 15);
-                            List<int> HideKeyidFujianid = new List<int>();
-                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
+                            if(m_OA_WorkPlan.PlanDataType == 15)
                             {
-                                if (!string.IsNullOrEmpty(HideKeyidFapiao[i]) && HideKeyidFapiao[i].ToInt32() != 0)
+                                var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+                                var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+                                //闇�瑕佸垹闄ょ殑闄勪欢
+                                var oA_WorkPlan_Attachments = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(m_OA_WorkPlan.Keyid.Value, 15);
+                                List<int> HideKeyidFujianid = new List<int>();
+                                for (int i = 0; i < HideKeyidFapiao.Length; i++)
                                 {
-                                    HideKeyidFujianid.Add(HideKeyidFapiao[i].ToInt32().Value);
+                                    if (!string.IsNullOrEmpty(HideKeyidFapiao[i]) && HideKeyidFapiao[i].ToInt32() != 0)
+                                    {
+                                        HideKeyidFujianid.Add(HideKeyidFapiao[i].ToInt32().Value);
+                                    }
+                                }
+
+                                var oA_WorkPlan_Attachments1 = oA_WorkPlan_Attachments.Where(x => !HideKeyidFujianid.Contains(x.Keyid)).ToList();
+
+                                foreach (var oa_WorkPlan_Attachment in oA_WorkPlan_Attachments1)
+                                {
+                                    res = oA_WorkPlan_AttachmentBLL.DeleteModel(oa_WorkPlan_Attachment);
+                                }
+
+                                for (int i = 0; i < HideKeyidFapiao.Length; i++)
+                                {
+                                    if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
+                                    {
+                                        var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+                                        a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+                                        a_WorkPlan_Attachment.AttachmentType = 15;
+                                        a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
+                                        a_WorkPlan_Attachment.CreateTime = DateTime.Now;
+                                        a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
+                                        var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+                                    }
+                                    else
+                                    {
+                                        continue;
+                                    }
                                 }
                             }
-
-                            var oA_WorkPlan_Attachments1 = oA_WorkPlan_Attachments.Where(x => !HideKeyidFujianid.Contains(x.Keyid)).ToList();
-
-                            foreach (var oa_WorkPlan_Attachment in oA_WorkPlan_Attachments1)
-                            {
-                                res = oA_WorkPlan_AttachmentBLL.DeleteModel(oa_WorkPlan_Attachment);
-                            }
-
-                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
-                            {
-                                if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
-                                {
-                                    var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
-                                    a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
-                                    a_WorkPlan_Attachment.AttachmentType = 15;
-                                    a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
-                                    a_WorkPlan_Attachment.CreateTime = DateTime.Now;
-                                    a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
-                                    var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
-                                }
-                                else
-                                {
-                                    continue;
-                                }
-                            }
+                            
 
                             scope.Complete();
 
@@ -254,30 +258,34 @@
 
                         var aaaa = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
                         m_OA_WorkPlan.Keyid = aaaa;
-                        if (aaaa > 0 && m_OA_WorkPlan.PlanDataType == 15)
+                        if (aaaa > 0 )
                         {
-                            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
-                            var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
-
-
-
-                           
-                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
+                            if(m_OA_WorkPlan.PlanDataType == 15)
                             {
-                                if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
+                                var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+                                var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+
+
+                                for (int i = 0; i < HideKeyidFapiao.Length; i++)
                                 {
-                                    var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
-                                    a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
-                                    a_WorkPlan_Attachment.AttachmentType = 15;
-                                    a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
-                                    a_WorkPlan_Attachment.CreateTime = DateTime.Now;
-                                    a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
-                                    var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+                                    if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
+                                    {
+                                        var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+                                        a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+                                        a_WorkPlan_Attachment.AttachmentType = 15;
+                                        a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
+                                        a_WorkPlan_Attachment.CreateTime = DateTime.Now;
+                                        a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
+                                        var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+                                    }
+                                    else
+                                    {
+                                        continue;
+                                    }
                                 }
-                                else
-                                {
-                                    continue;
-                                }
+
                             }
 
 
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 2c363d1..adce8f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -196,100 +196,123 @@
 
     var zj = 0;
     var num = 0;
+    var shijuannum = 0;
+    var datikanum = 0;
     var count = $('[name="yuwencheckboxinput"]').length;
     for (var i = 0; i < count; i++) {
         var Nianji = $("select[name='selNianji'][value_id='" + (i + 1) + "']").val();
-        if (Nianji == "涓�骞寸骇" || Nianji == "涓�骞寸骇") {
+        if (Nianji == "涓�骞寸骇" || Nianji == "浜屽勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnpingde != "") {
                 num = num + parseInt(numnnpingde);
+                shijuannum = shijuannum + parseInt(numnnpingde);
             }
         }
         else if (Nianji == "涓夊勾绾�" || Nianji == "鍥涘勾绾�" || Nianji == "浜斿勾绾�" || Nianji == "鍏勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
             var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnpingde != "") {
                 num = num + parseInt(numnnpingde);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
         }
         else if (Nianji == "涓冨勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum+ parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum+ parseInt(numnnyingyu);
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
+                shijuannum = shijuannum + parseInt(numnnlishi);
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
+                shijuannum = shijuannum + parseInt(numnndili);
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
+                shijuannum = shijuannum + parseInt(numnnshengwu);
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
+                shijuannum = shijuannum + parseInt(numnnsixiang);
             }
             
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
+                datikanum = datikanum + parseInt(numnnyuwendatika);
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
+                datikanum = datikanum + parseInt(numnnshuxuedatika);
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
+                datikanum = datikanum + parseInt(numnnyingyudatika);
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
+                datikanum = datikanum + parseInt(numnnlishidatika);
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
             }
             var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwudatika != "") {
                 num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
             }
             var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiangpingdedatika != "") {
                 num = num + parseInt(numnnsixiangpingdedatika);
+                datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
             }
             
             
@@ -300,69 +323,85 @@
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
+                shijuannum = shijuannum + parseInt(numnnlishi);
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
+                shijuannum = shijuannum + parseInt(numnndili);
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
+                shijuannum = shijuannum + parseInt(numnnshengwu);
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
+                shijuannum = shijuannum + parseInt(numnnsixiang);
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
+                shijuannum = shijuannum + parseInt(numnnwuli);
             }
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
+                datikanum = datikanum + parseInt(numnnyuwendatika);
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
+                datikanum = datikanum + parseInt(numnnshuxuedatika);
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
+                datikanum = datikanum + parseInt(numnnyingyudatika);
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
+                datikanum = datikanum + parseInt(numnnlishidatika);
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
             }
             var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwudatika != "") {
                 num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
             }
             var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiangpingdedatika != "") {
                 num = num + parseInt(numnnsixiangpingdedatika);
+                datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
             }
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
+                datikanum = datikanum + parseInt(numnnwulidatika);
             }
 
         }
@@ -371,65 +410,79 @@
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
+                shijuannum = shijuannum + parseInt(numnnlishi);
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
+                shijuannum = shijuannum + parseInt(numnnwuli);
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxue != "") {
                 num = num + parseInt(numnnhuaxue);
+                shijuannum = shijuannum + parseInt(numnnhuaxue);
             }
             
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
+                shijuannum = shijuannum + parseInt(numnnsixiang);
             }
           
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
+                datikanum = datikanum + parseInt(numnnyuwendatika);
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
+                datikanum = datikanum + parseInt(numnnshuxuedatika);
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
+                datikanum = datikanum + parseInt(numnnyingyudatika);
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
+                datikanum = datikanum + parseInt(numnnlishidatika);
             }
 
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
+                datikanum = datikanum + parseInt(numnnwulidatika);
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
+                datikanum = datikanum + parseInt(numnnhuaxuedatika);
             }
             var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiangpingdedatika != "") {
                 num = num + parseInt(numnnsixiangpingdedatika);
+                datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
             }
              
            
@@ -440,72 +493,88 @@
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
+                shijuannum = shijuannum + parseInt(numnnlishi);
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
+                shijuannum = shijuannum + parseInt(numnndili);
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
+                shijuannum = shijuannum + parseInt(numnnwuli);
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxue != "") {
                 num = num + parseInt(numnnhuaxue);
+                shijuannum = shijuannum + parseInt(numnnhuaxue);
             }
 
             var numnnzhengzhi = $("input[name='zhengzhicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhi != "") {
                 num = num + parseInt(numnnzhengzhi);
+                shijuannum = shijuannum + parseInt(numnnzhengzhi);
             }
 
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
+                datikanum = datikanum + parseInt(numnnyuwendatika);
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
+                datikanum = datikanum + parseInt(numnnshuxuedatika);
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
+                datikanum = datikanum + parseInt(numnnyingyudatika);
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
+                datikanum = datikanum + parseInt(numnnlishidatika);
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
             }
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
+                datikanum = datikanum + parseInt(numnnwulidatika);
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
+                datikanum = datikanum + parseInt(numnnhuaxuedatika);
             }
             var numnnzhengzhidatika = $("input[name='zhengzhidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhidatika != "") {
                 num = num + parseInt(numnnzhengzhidatika);
+                datikanum = datikanum + parseInt(numnnzhengzhidatika);
             }
         }
         else if (Nianji == "楂樹簩" || Nianji == "楂樹笁") {
@@ -514,80 +583,98 @@
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
+                shijuannum = shijuannum + parseInt(numnn);
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
+                shijuannum = shijuannum + parseInt(numnnlishi);
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
+                shijuannum = shijuannum + parseInt(numnndili);
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
+                shijuannum = shijuannum + parseInt(numnnshengwu);
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
+                shijuannum = shijuannum + parseInt(numnnwuli);
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxue != "") {
                 num = num + parseInt(numnnhuaxue);
+                shijuannum = shijuannum + parseInt(numnnhuaxue);
             }
 
             var numnnzhengzhi = $("input[name='zhengzhicheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhi != "") {
                 num = num + parseInt(numnnzhengzhi);
+                shijuannum = shijuannum + parseInt(numnnzhengzhi);
             }
 
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
+                datikanum = datikanum + parseInt(numnnyuwendatika);
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
+                datikanum = datikanum + parseInt(numnnshuxuedatika);
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
+                datikanum = datikanum + parseInt(numnnyingyudatika);
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
+                datikanum = datikanum + parseInt(numnnlishidatika);
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
             }
             var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwudatika != "") {
                 num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
             }
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
+                datikanum = datikanum + parseInt(numnnwulidatika);
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
+                datikanum = datikanum + parseInt(numnnhuaxuedatika);
             }
             var numnnzhengzhidatika = $("input[name='zhengzhidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhidatika != "") {
                 num = num + parseInt(numnnzhengzhidatika);
+                datikanum = datikanum + parseInt(numnnzhengzhidatika);
             }
 
         }
@@ -595,6 +682,8 @@
             var numnnRenshu = $("input[name='txtRenshu'][value_id='" + (i + 1) + "']").val();
             if (numnnRenshu != "") {
                 num = num + parseInt(numnnRenshu);
+                shijuannum = shijuannum + parseInt(numnnRenshu);
+                datikanum = datikanum + parseInt(numnnRenshu);
             }
            
         }
@@ -603,6 +692,8 @@
     }
 
     $("#printCount").val(num);
+    $("#ShijuanprintCount").val(shijuannum);
+    $("#DatikaprintCount").val(datikanum);
     var zj = $("#txtSumPrice").val();
     if (zj != "") {
         if (num == 0) {
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 1954352..13e4417 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -599,6 +599,318 @@
     } else {
         $("#Duiyinghetongbianhao").show();
     }
+
+
+
+    if (sel.value == 29) {
+        $("#BlackAndWhite29").show();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    if (sel.value == 29) {
+        $("#BlackAndWhite29").show();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 6) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").show();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 15) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").show();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 14) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").show();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 27) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").show();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 21) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").show();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 7) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").show();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 38) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").show();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 20) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").show();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 16) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").show();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 22) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").show();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 39) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").show();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 23) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").show();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 25) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").show();
+        $("#Packet26").hide();
+        $("#Qita1111").hide();
+    }
+    else if (sel.value == 26) {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").show();
+        $("#Qita1111").hide();
+    }
+    else {
+        $("#BlackAndWhite29").hide();
+        $("#Book6").hide();
+        $("#PictureAlbumNew15").hide();
+        $("#DMInquiry14").hide();
+        $("#ReceiptDocument27").hide();
+        $("#Envelop21").hide();
+        $("#NewsPaper7").hide();
+        $("#Shijuan38").hide();
+        $("#Adhesive20").hide();
+        $("#Reticule16").hide();
+        $("#Note22").hide();
+        $("#GongWenZhi39").hide();
+        $("#Calendary23").hide();
+        $("#DeskCalendar25").hide();
+        $("#Packet26").hide();
+        $("#Qita1111").show();
+    }
+
+
+
 }
 
 

--
Gitblit v1.9.1