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

zrg

2024-09-11 decf3bc3b6eafa8541af8c724f994d6a0f31b8e1

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -35,7 +35,7 @@
                {
                    ds = oCN.RunProcReturn("select * from  Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");

                    if (ds.Tables[0].Rows.Count == 0) {
                    if (ds.Tables[0].Rows.Count != 0) {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess！";
@@ -88,6 +88,7 @@
            public string Alignment;
            public string ColumnWidth;
            public string ColumnName_Other;
            public bool IsTotalRow;
        }

        [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -140,7 +141,7 @@

                    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 += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";
                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);

@@ -224,7 +225,7 @@
                    if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
                        width = "120";
                    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 += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";

                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -309,7 +310,19 @@
            try
            {
                ds = oCN.RunProcReturn("select * from  Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    ds = oCN.RunProcReturn("select * from  Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "'", "Xt_ModuleButtonSet");

                    if (ds.Tables[0].Rows.Count != 0)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = ds.Tables[0].Rows.Count;
                        objJsonResult.Message = "Sucess！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = ds.Tables[0].Rows.Count;
                objJsonResult.Message = "Sucess！";