From 5e037991e66d407f8dd0a11a1d66698d381b5a0b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 22 八月 2024 14:23:34 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 414f097..1b4ba59 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -87,6 +87,7 @@
             public bool IsHide;
             public string Alignment;
             public string ColumnWidth;
+            public string ColumnName_Other;
         }
 
         [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -136,7 +137,10 @@
                     var width = omdelsub[i].ColumnWidth;
                     if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
                         width = "120";
-                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width},";
+
+                    var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
+
+                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
                 }
                 HGridString = HGridString.Substring(0, HGridString.Length - 1);
 
@@ -219,7 +223,9 @@
                     var width = omdelsub[i].ColumnWidth;
                     if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
                         width = "120";
-                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{omdelsub[i].ColumnName},";
+                    var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
+                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
+
                 }
                 HGridString = HGridString.Substring(0, HGridString.Length - 1);
 

--
Gitblit v1.9.1