合并分支

chenhaozhe

2026-03-18 345c2d7083b30becd05755feb048a4b27fb68c7e

合并分支

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -32,3 +32,4 @@
E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -936,7 +936,7 @@
               }
                
                // èŽ·å–项目根目录
                string path = HttpContext.Current.Server.MapPath($"~/LanguagePack"); ;
                string path = HttpContext.Current.Server.MapPath($"~/LanguagePack"); 
                string lang;
                bool langSuccess = LanguageDictionary.TryGetValue(language, out lang);
                if(langSuccess == false)

 WebAPI/Controllers/WebAPIController.cs

@@ -21765,6 +21765,8 @@
            public string HTranslationText_English { get; set; }
            public string HTranslationText_Spain { get; set; }
            public List<MenuLoad> childMenus { get; set; }
            public DateTime HMakeDate { get; set; }
            public string HMaker { get; set; }
        }

        [Route("Web/MenuList")]
@@ -21872,6 +21874,163 @@

        #endregion

        #region æž„建路由嵌套对象
        [Route("Web/MenuList_1")]
        [HttpGet]
        public object MenuList_1(string HMakeName, string HType)
        {
            try
            {
                string filePath = HttpContext.Current.Server.MapPath($"~/RouterDisplay/DisplayConfig.json");
                string directory = Path.GetDirectoryName(filePath);
                if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
                {
                    Directory.CreateDirectory(directory);
                }
                DateTime lastWriteTime = File.GetLastWriteTime(filePath);
                lastWriteTime = new DateTime(lastWriteTime.Year, lastWriteTime.Month, lastWriteTime.Day, lastWriteTime.Hour, 0, 0);
                DataSet ds = oCN.RunProcReturn($"select top 1 HMakeDate from Gy_Menu_1_build ORDER BY HMakeDate desc  ", "Gy_Menu_1_build");

                DateTime dbTime = Convert.ToDateTime(ds.Tables[0].Rows[0]["HMakeDate"]);
                dbTime = new DateTime(dbTime.Year, dbTime.Month, dbTime.Day, dbTime.Hour, 0, 0);
                
                if (dbTime> lastWriteTime)
                {
                    List<MenuLoad> mu = new List<MenuLoad>();                       //以父子级结构存放菜单清单信息
                    SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();            //数据库操作工具
                    string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain  from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
                    ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet");        //查询当前用户的自定义菜单数据
                    if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
                    {
                        string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName=" +
                            "(select   top 1 c.GroupName  from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId  " +
                            "left join System_UserGroup c on b.GroupId = c.GroupID  where a.Czymc ='" + HMakeName + "' order by len(c.GroupName ))";
                        ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet");        //查询用户绑定的角色 æ˜¯å¦è®¾ç½®èœå•ä¿¡æ¯ å–角色名称最短的一个
                        if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
                        {
                            sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain  from Gy_MenuDefineSet where HMakeName = 'admin' and HType = '" + HType + "' order by HPosition";
                            ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet");   //查询admin æ˜¯å¦è®¾ç½®èœå•ä¿¡æ¯
                            if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
                            {
                                sql = "Select HitemID,HNumber,HName,HPartentID,HLevel,Hurl,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain,HPicNum from Gy_Menu_1_build where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID  ";
                                ds = oCn.RunProcReturn(sql, "Gy_Menu_1_build");
                            }

                        }
                    }

                    for (int i = 0; i < ds.Tables[0].Rows.Count; i++)       //将菜单的根节点保存到列表menu中
                    {
                        if (ds.Tables[0].Rows[i]["HPartentID"].ToString() == "0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString())  //判断是否最外层根节点
                        {
                            MenuLoad tbj = new MenuLoad();
                            tbj.HitemID = ds.Tables[0].Rows[i]["HitemID"].ToString();
                            tbj.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString();
                            tbj.HName = ds.Tables[0].Rows[i]["HName"].ToString();
                            tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
                            tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
                            tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
                            tbj.HShowMode = ds.Tables[0].Rows[i]["HShowMode"].ToString();
                            tbj.HTranslationText_English = ds.Tables[0].Rows[i]["HTranslationText_English"].ToString();
                            tbj.HTranslationText_Spain = ds.Tables[0].Rows[i]["HTranslationText_Spain"].ToString();
                            if (ds.Tables[0].Rows[i]["HPicNum"] != null)
                            {
                                tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString();
                            }
                            mu.Add(tbj);
                        }
                    }
                    diguiLoad(ds.Tables[0], mu);                //使用递归，将需要加载的数据以父子级的结构存放在mu中


                    objJsonResult.code = "1";//信号参数
                    objJsonResult.count = 1;
                    objJsonResult.Message = "查询成功！";
                    objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(mu);
                    return objJsonResult;
                }
                else
                {
                    string josncontext = File.ReadAllText(filePath);
                    objJsonResult.code = "2";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "查询成功！";
                    objJsonResult.data = josncontext;
                    return objJsonResult;
                }
                
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询失败！";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }

        public class RequestDto
        {
            public string content { get; set; }
        }
        [Route("Web/buildRouteObj")]
        [HttpPost]
        public object buildRouteObj([FromBody] RequestDto request)
        {
            string filePath = HttpContext.Current.Server.MapPath($"~/RouterDisplay/DisplayConfig.json");
            try
            {
                string jsonContent = request.content;
                if (string.IsNullOrEmpty(jsonContent))
                {
                    
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "JSON å†…容不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(filePath))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "文件路径不能为空。！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string directory = Path.GetDirectoryName(filePath);
                if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
                {
                    Directory.CreateDirectory(directory);
                }
                string contentToWrite = jsonContent;

                File.WriteAllText(filePath, contentToWrite);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "文件保存成功，路径为"+filePath;
                objJsonResult.data = null;
                LogService.Write($"路径为{filePath}");
                return objJsonResult;
            }
            catch (Exception e)
            {

                LogService.Write("Exception！" + e.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion




        #region [菜单目录自定义]


 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -14949,7 +14949,7 @@
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = oDs.Tables[0];
                return objJsonResult;

 WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>E:\gz\网站发布\MES-WEB-API</_PublishTargetUrl>
    <History>True|2026-03-17T01:47:22.1297149Z;True|2026-03-17T09:44:08.6128092+08:00;</History>
    <History>True|2026-03-18T07:00:47.1884564Z;False|2026-03-18T15:00:14.9424167+08:00;True|2026-03-17T09:47:22.1297149+08:00;True|2026-03-17T09:44:08.6128092+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>03/17/2026 09:40:41</publishTime>
      <publishTime>03/18/2026 15:00:30</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>03/17/2026 09:40:41</publishTime>
      <publishTime>03/18/2026 15:00:30</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>03/17/2026 09:40:38</publishTime>
      <publishTime>03/18/2026 15:00:28</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>03/17/2026 09:40:38</publishTime>
      <publishTime>03/18/2026 15:00:28</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>03/17/2026 09:40:35</publishTime>
      <publishTime>03/18/2026 15:00:23</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>03/17/2026 09:40:35</publishTime>
      <publishTime>03/18/2026 15:00:23</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -141,10 +141,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>03/17/2026 09:40:37</publishTime>
      <publishTime>03/18/2026 15:00:25</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>03/17/2026 09:40:37</publishTime>
      <publishTime>03/18/2026 15:00:25</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -180,25 +180,25 @@
      <publishTime>11/13/2012 12:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>03/17/2026 09:40:33</publishTime>
      <publishTime>03/17/2026 11:23:36</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>03/17/2026 09:40:33</publishTime>
      <publishTime>03/17/2026 11:23:36</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>03/17/2026 09:40:34</publishTime>
      <publishTime>03/17/2026 11:23:37</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>03/17/2026 09:40:34</publishTime>
      <publishTime>03/17/2026 11:23:37</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>03/17/2026 09:40:34</publishTime>
      <publishTime>03/18/2026 13:06:42</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>03/17/2026 09:40:34</publishTime>
      <publishTime>03/18/2026 13:06:42</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -321,22 +321,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>03/17/2026 09:32:59</publishTime>
      <publishTime>03/18/2026 13:06:42</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>03/17/2026 09:32:59</publishTime>
      <publishTime>03/18/2026 13:06:42</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>03/17/2026 09:44:00</publishTime>
      <publishTime>03/18/2026 15:00:39</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>03/17/2026 09:44:00</publishTime>
      <publishTime>03/18/2026 15:00:39</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>03/17/2026 09:44:04</publishTime>
      <publishTime>03/18/2026 15:00:44</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 WebAPI/WebAPI.csproj.user

@@ -12,7 +12,7 @@
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>E:\gz\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile11.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <ProjectExtensions>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -32,3 +32,4 @@
E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ