Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jhz

2023-04-13 cfee793e8fb3ec23c879e6086db8c25ddd368b46

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -56,13 +56,14 @@
            public string HSortFlag;
            public string HSelTotal;
            public string HColumnWidth;
          

        }
        public class grdAlignmentSub
        {
            public string ColumnName;
            public bool IsHide;
            public string Alignment;
            public string ColumnWidth;
        }

        [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -109,7 +110,10 @@
                var HGridString = "";
                for (int i = 0; i < omdelsub.Count; i++)
                {
                    HGridString += $"{(i+1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment},";
                    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},";
                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);

@@ -119,7 +123,7 @@
                    ")  values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
                    "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" +
                    ",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
                    ","+ (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
                    "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");


                objJsonResult.code = "1";