From e0c41d644ec4ec263bc299c0ceba9193ab435a15 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 十一月 2025 08:50:46 +0800
Subject: [PATCH] 20251111  设计订单需要看到设计要求和设计费的情况

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
index 80bc013..62f8454 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -44,6 +44,8 @@
         Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
         public int ContractCount = 0;
         public string BuyerId = "";
+        public int OrderId = 0;
+        public string shejidingdanid = "";
         /// <summary>
         /// 椤甸潰鍔犺浇浜嬩欢
         /// </summary>
@@ -112,11 +114,18 @@
                 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)
+            EC_OrderBasic shejiorder = _eC_OrderBasicBLL.SelectModelByxiadanId(orderId.Value);
+
+            if (shejiorder != null)
             {
-                CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
-                return false;
+                shejidingdanid = shejiorder.Keyid.ToString();
             }
+           
+            //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)
@@ -124,7 +133,14 @@
                 CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
                 return false;
             }
-
+            if(_eC_OrderBasic.OrderExtend.NumPerBag == "NaN")
+            {
+                _eC_OrderBasic.OrderExtend.NumPerBag = "";
+            }
+            if (_eC_OrderBasic.OrderExtend.BagNum == "NaN")
+            {
+                _eC_OrderBasic.OrderExtend.BagNum = "";
+            }
             _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
             _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
 
@@ -153,6 +169,7 @@
                 _eC_OrderBasic.UnitName = sys_Dictionarie.Name;
             }
             BuyerId = _eC_OrderBasic.BuyerId.ToString();
+            OrderId = _eC_OrderBasic.Keyid.Value;
             //鏌ヨ瀹㈡埛鏄惁鏈夊悎鍚�
             Database DC = new Database();
             try

--
Gitblit v1.9.1