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

yusijie

2025-01-09 c34e85eda515636993b37a752b52c0f43ae6e17b

 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);

@@ -223,7 +224,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}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";

                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);

@@ -306,8 +309,20 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from  Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
                ds = oCN.RunProcReturn("select * from  Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "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" + "' order by HOrder", "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！";
@@ -331,6 +346,7 @@
            public string BtnID;
            public string BtnName;
            public bool IsHide;
            public string HOtherName;
        }
        public class noEditList
        {
@@ -341,6 +357,7 @@
            public int HOrder;
            public bool HHideFlag;
            public bool HEditFlag;
            public string HOtherName;
        }

        [Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -402,6 +419,7 @@
                            string HButtonID = HButtonIDLists[j].ToString();
                            string HButtonName = HButtonNameLists[j].ToString();
                            int HOrder = HOrderLists[j];
                            string HOtherName = button[i].HOtherName;
                            if (button[i].IsHide)
                            {
                                HHideFlag = 1;
@@ -411,7 +429,7 @@
                                HEditFlag = 0;
                                HHideFlag = 0;
                            }
                            string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
                            string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
                            oCN.RunProc(sql);
                        }
                    }
@@ -429,7 +447,8 @@
                            string HButtonID = noEditLists[i].HButtonID;
                            string HButtonName = noEditLists[i].HButtonName;
                            int HOrder = HOrderLists[j];
                            string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
                            string HOtherName = noEditLists[i].HOtherName;
                            string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
                            oCN.RunProc(sql);
                        }
                    }