~yxj/MES-WEB-API.git

parent: 7876e05b | 补丁 | 提交 | ignore whitespace

duhe

2023-07-13 6ea5097e09493383a24f493773c433384636a430

菜单加载：调节菜单次序

2个文件已修改

	WebAPI/Controllers/WebAPIController.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/WebAPIController.cs

@@ -3933,11 +3933,11 @@
            {
                List<MenuLoad> mu = new List<MenuLoad>();                       //以父子级结构存放菜单清单信息
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();            //数据库操作工具
                string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' order by HItemID";
                string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' order by HPosition";
                ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet");        //查询当前用户的自定义菜单数据
                if (ds.Tables[0]==null || ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
                {
                    sql = "Select * from Gy_Menu_1 Order by HItemID ";
                    sql = "Select * from Gy_Menu_1 Order by HPosition ";
                    ds = oCn.RunProcReturn(sql, "Gy_Menu");
                }

@@ -4175,8 +4175,18 @@
                        string HType = ds.Tables[0].Rows[0]["HType"].ToString();
                        string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();

                        sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "')";
                        oCN.RunProc(sql);
                        if(HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"])
                        {
                            string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
                            oCN.RunProc(sql);
                        }
                        else
                        {
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
                            oCN.RunProc(sql);
                        }
                        
                    }
                }
                //提交数据库操作

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -20,12 +20,12 @@
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>07/13/2023 11:30:32</publishTime>
      <publishTime>07/13/2023 13:35:43</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>07/13/2023 11:30:32</publishTime>
      <publishTime>07/13/2023 13:35:43</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>07/13/2023 11:30:31</publishTime>
      <publishTime>07/13/2023 13:35:42</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>07/13/2023 11:30:31</publishTime>
      <publishTime>07/13/2023 13:35:42</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/15/2022 13:55:23</publishTime>
      <publishTime>07/13/2023 11:30:28</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/09/2022 16:01:58</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>07/13/2023 11:30:28</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>07/13/2023 11:30:28</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>07/13/2023 11:30:28</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,33 +147,33 @@
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:38</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:38</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>07/13/2023 11:30:27</publishTime>
      <publishTime>07/13/2023 13:35:39</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>07/13/2023 11:30:36</publishTime>
      <publishTime>07/13/2023 13:35:47</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>07/13/2023 11:30:36</publishTime>
      <publishTime>07/13/2023 13:35:47</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
    <File Include="Web.config">
      <publishTime>11/14/2022 11:24:08</publishTime>
      <publishTime>11/02/2022 22:03:20</publishTime>
      <publishTime>07/13/2023 11:30:39</publishTime>
      <publishTime>07/13/2023 13:35:51</publishTime>
    </File>
  </ItemGroup>
</Project>

			@@ -3933,11 +3933,11 @@
			{
			List<MenuLoad> mu = new List<MenuLoad>(); //以父子级结构存放菜单清单信息
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //数据库操作工具
			string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' order by HItemID";
			string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' order by HPosition";
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0]==null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			sql = "Select * from Gy_Menu_1 Order by HItemID ";
			sql = "Select * from Gy_Menu_1 Order by HPosition ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			}

			@@ -4175,8 +4175,18 @@
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();
			string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();

			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "')";
			oCN.RunProc(sql);
			if(HPartentID == "0" \|\| HPartentID == ds.Tables[0].Rows[0]["HItemID"])
			{
			string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
			oCN.RunProc(sql);
			}
			else
			{
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
			oCN.RunProc(sql);
			}

			}
			}
			//提交数据库操作

			@@ -20,12 +20,12 @@
			<File Include="bin/BLL.dll">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>07/13/2023 11:30:32</publishTime>
			<publishTime>07/13/2023 13:35:43</publishTime>
			</File>
			<File Include="bin/BLL.pdb">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>07/13/2023 11:30:32</publishTime>
			<publishTime>07/13/2023 13:35:43</publishTime>
			</File>
			<File Include="bin/BouncyCastle.Crypto.dll">
			<publishTime>12/18/2020 05:32:28</publishTime>
			@@ -33,12 +33,12 @@
			<File Include="bin/DAL.dll">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>07/13/2023 11:30:31</publishTime>
			<publishTime>07/13/2023 13:35:42</publishTime>
			</File>
			<File Include="bin/DAL.pdb">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>07/13/2023 11:30:31</publishTime>
			<publishTime>07/13/2023 13:35:42</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 22:52:40</publishTime>
			@@ -46,12 +46,12 @@
			<File Include="bin/DBUtility.dll">
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/15/2022 13:55:23</publishTime>
			<publishTime>07/13/2023 11:30:28</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/DBUtility.pdb">
			<publishTime>11/09/2022 16:01:58</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>07/13/2023 11:30:28</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/Grpc.Core.Api.dll">
			<publishTime>03/22/2022 13:17:26</publishTime>
			@@ -107,12 +107,12 @@
			<File Include="bin/Model.dll">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>07/13/2023 11:30:28</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/Model.pdb">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>07/13/2023 11:30:28</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
			<publishTime>04/06/2023 15:57:02</publishTime>
			@@ -147,33 +147,33 @@
			<File Include="bin/Pub_Class.dll">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:38</publishTime>
			</File>
			<File Include="bin/Pub_Class.pdb">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:38</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/Pub_Control.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/RestSharp.dll">
			<publishTime>08/31/2012 06:22:50</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/SQLHelper.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>07/13/2023 11:30:27</publishTime>
			<publishTime>07/13/2023 13:35:39</publishTime>
			</File>
			<File Include="bin/stdole.dll">
			<publishTime>05/09/2021 13:35:37</publishTime>
			@@ -286,7 +286,7 @@
			<File Include="bin/WebAPI.dll">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>07/13/2023 11:30:36</publishTime>
			<publishTime>07/13/2023 13:35:47</publishTime>
			</File>
			<File Include="bin/WebAPI.dll.config">
			<publishTime>12/15/2021 17:59:43</publishTime>
			@@ -294,7 +294,7 @@
			<File Include="bin/WebAPI.pdb">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>07/13/2023 11:30:36</publishTime>
			<publishTime>07/13/2023 13:35:47</publishTime>
			</File>
			<File Include="bin/WebGrease.dll">
			<publishTime>07/18/2013 01:03:52</publishTime>
			@@ -503,7 +503,7 @@
			<File Include="Web.config">
			<publishTime>11/14/2022 11:24:08</publishTime>
			<publishTime>11/02/2022 22:03:20</publishTime>
			<publishTime>07/13/2023 11:30:39</publishTime>
			<publishTime>07/13/2023 13:35:51</publishTime>
			</File>
			</ItemGroup>
			</Project>