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

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs |  117 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
index 074f108..c2416c4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.business {
-    
-    
-    public partial class AgMergerOrderDetail {
-        
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class AgMergerOrderDetail
+    {
+
         /// <summary>
         /// FormCon 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm FormCon;
-        
+
         /// <summary>
         /// hideOrderId 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
-        
+
         /// <summary>
         /// spanSpecialNum_o 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum_o;
-        
+
         /// <summary>
         /// spanExigencyDegree 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanExigencyDegree;
-        
+
         /// <summary>
         /// spanSpecialNum 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum;
-        
+
         /// <summary>
         /// spanOutFirm 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOutFirm;
-        
+
         /// <summary>
         /// spanSpecialOprator 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-        
+
         /// <summary>
         /// spanSpecialTime 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-        
+
         /// <summary>
         /// RepClientList 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepClientList;
-        
+
+        /// <summary>
+        /// yuanshi 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable yuanshi;
+
         /// <summary>
         /// spanPMS_PaperSource 鎺т欢銆�
         /// </summary>
@@ -101,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperSource;
-        
+
         /// <summary>
         /// spanPMS_PaperName 鎺т欢銆�
         /// </summary>
@@ -110,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperName;
-        
+
         /// <summary>
         /// spanSelfPaperName 鎺т欢銆�
         /// </summary>
@@ -119,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfPaperName;
-        
+
         /// <summary>
         /// spanPMS_PaperSpecification 鎺т欢銆�
         /// </summary>
@@ -128,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperSpecification;
-        
+
         /// <summary>
         /// spanSelfPaperSpec 鎺т欢銆�
         /// </summary>
@@ -137,7 +148,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfPaperSpec;
-        
+
         /// <summary>
         /// spanPMS_PaperCount 鎺т欢銆�
         /// </summary>
@@ -146,7 +157,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperCount;
-        
+
         /// <summary>
         /// spanPMS_PaperPositive 鎺т欢銆�
         /// </summary>
@@ -155,7 +166,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperPositive;
-        
+
         /// <summary>
         /// spanPMS_PaperConsume 鎺т欢銆�
         /// </summary>
@@ -164,7 +175,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_PaperConsume;
-        
+
         /// <summary>
         /// spanPMS_Machine 鎺т欢銆�
         /// </summary>
@@ -173,7 +184,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_Machine;
-        
+
         /// <summary>
         /// spanPSF_Typesetting 鎺т欢銆�
         /// </summary>
@@ -182,7 +193,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSF_Typesetting;
-        
+
         /// <summary>
         /// spanPMS_IsRevisedEdition 鎺т欢銆�
         /// </summary>
@@ -191,7 +202,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_IsRevisedEdition;
-        
+
         /// <summary>
         /// spanPMS_IsColorSamples 鎺т欢銆�
         /// </summary>
@@ -200,7 +211,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_IsColorSamples;
-        
+
         /// <summary>
         /// spanPMS_ChromaticNumber 鎺т欢銆�
         /// </summary>
@@ -209,7 +220,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_ChromaticNumber;
-        
+
         /// <summary>
         /// spanPlateSource 鎺т欢銆�
         /// </summary>
@@ -218,7 +229,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlateSource;
-        
+
         /// <summary>
         /// spanCTPSpec 鎺т欢銆�
         /// </summary>
@@ -227,7 +238,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCTPSpec;
-        
+
         /// <summary>
         /// spanSelfCTPSpec 鎺т欢銆�
         /// </summary>
@@ -236,7 +247,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfCTPSpec;
-        
+
         /// <summary>
         /// spanSelfFilmSpec 鎺т欢銆�
         /// </summary>
@@ -245,7 +256,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSelfFilmSpec;
-        
+
         /// <summary>
         /// lbCTPCount 鎺т欢銆�
         /// </summary>
@@ -254,7 +265,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbCTPCount;
-        
+
         /// <summary>
         /// tdCTPCount 鎺т欢銆�
         /// </summary>
@@ -263,7 +274,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdCTPCount;
-        
+
         /// <summary>
         /// spanCTPCount 鎺т欢銆�
         /// </summary>
@@ -272,7 +283,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCTPCount;
-        
+
         /// <summary>
         /// lbPSSpec 鎺т欢銆�
         /// </summary>
@@ -281,7 +292,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSSpec;
-        
+
         /// <summary>
         /// tdPSSpec 鎺т欢銆�
         /// </summary>
@@ -290,7 +301,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPSSpec;
-        
+
         /// <summary>
         /// spanPSbanSpec 鎺т欢銆�
         /// </summary>
@@ -299,7 +310,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSbanSpec;
-        
+
         /// <summary>
         /// lbPSCount 鎺т欢銆�
         /// </summary>
@@ -308,7 +319,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSCount;
-        
+
         /// <summary>
         /// tdPsCount 鎺т欢銆�
         /// </summary>
@@ -317,7 +328,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPsCount;
-        
+
         /// <summary>
         /// spanPSCount 鎺т欢銆�
         /// </summary>
@@ -326,7 +337,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPSCount;
-        
+
+        /// <summary>
+        /// tdBlank 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell tdBlank;
+
         /// <summary>
         /// spanPMS_CompletionTime 鎺т欢銆�
         /// </summary>
@@ -335,7 +355,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_CompletionTime;
-        
+
         /// <summary>
         /// spanPMS_TotalPrice 鎺т欢銆�
         /// </summary>
@@ -344,7 +364,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_TotalPrice;
-        
+
         /// <summary>
         /// spanPMS_Remarks 鎺т欢銆�
         /// </summary>
@@ -353,5 +373,14 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPMS_Remarks;
+
+        /// <summary>
+        /// Repeater1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater Repeater1;
     }
 }

--
Gitblit v1.9.1