zrg
2024-07-11 258c4add3e9a831ecfd01a92e26a5d1b61b40e31
根据系统参数区分斯莫尔自动获取上级
2个文件已修改
52 ■■■■■ 已修改文件
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -6853,14 +6853,28 @@
        {
            try
            {
                string sReturn = "";
                List<object> columnNameList = new List<object>();
                //根据当前人获取职务
                string sql = "select a.Czymc 用户名称,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 = '"+HName+"'";
                ds = oCN.RunProcReturn(sql, "Gy_ErrMsgBackType");
                string Job = ds.Tables[0].Rows[0]["职务"].ToString();
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    //系统参数是否为私有云模式,N为本地,Y为斯莫尔
                    if (oSystemParameter.omodel.OA_ErrMsgBackBill_SendDingDingMsg == "N")
                    {
                         Job = ds.Tables[0].Rows[0]["职务"].ToString();
                    }
                    else
                    {
                        Job = "注塑班组长";
                    }
                }
                //根据职务找到他的上级
                string sql1 = "select *  from Gy_Duty where HParentID=(select HParentID from Gy_Duty where HItemID =(select HParentID from Gy_Duty group by HParentID, HName having HName = '"+Job+"' and count(*) = 1))";
                ds = oCN.RunProcReturn(sql1, "Gy_Duty");
                ds = oCN.RunProcReturn(sql1, "Gy_Duty");
                string Job1= ds.Tables[0].Rows[0]["HName"].ToString(); 
                //用上级的职务找到用户
                string sql2 = "select a.Czymc 用户名称  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 c.GroupName = '"+Job1+"'";
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-07-10T07:01:02.3675403Z;True|2024-07-10T13:44:55.6004881+08:00;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+08:00;</History>
    <History>True|2024-07-11T09:18:30.0863171Z;True|2024-07-10T15:01:02.3675403+08:00;True|2024-07-10T13:44:55.6004881+08:00;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/10/2024 15:00:41</publishTime>
      <publishTime>07/11/2024 17:18:06</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/10/2024 15:00:41</publishTime>
      <publishTime>07/11/2024 17:18:06</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/10/2024 15:00:40</publishTime>
      <publishTime>07/11/2024 17:18:05</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/10/2024 15:00:40</publishTime>
      <publishTime>07/11/2024 17:18:05</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/10/2024 15:00:37</publishTime>
      <publishTime>07/11/2024 17:18:02</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/10/2024 15:00:37</publishTime>
      <publishTime>07/11/2024 17:18:02</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/10/2024 15:00:38</publishTime>
      <publishTime>07/11/2024 17:18:03</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/10/2024 15:00:38</publishTime>
      <publishTime>07/11/2024 17:18:03</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/10/2024 15:00:35</publishTime>
      <publishTime>07/11/2024 17:17:59</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/10/2024 15:00:35</publishTime>
      <publishTime>07/11/2024 17:17:59</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/10/2024 15:00:36</publishTime>
      <publishTime>07/11/2024 17:18:00</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/10/2024 15:00:36</publishTime>
      <publishTime>07/11/2024 17:18:00</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/10/2024 15:00:37</publishTime>
      <publishTime>07/11/2024 17:18:01</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/10/2024 15:00:37</publishTime>
      <publishTime>07/11/2024 17:18:01</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/10/2024 15:00:46</publishTime>
      <publishTime>07/11/2024 17:18:16</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/10/2024 15:00:46</publishTime>
      <publishTime>07/11/2024 17:18:16</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/10/2024 15:01:01</publishTime>
      <publishTime>07/11/2024 17:18:29</publishTime>
    </File>
  </ItemGroup>
</Project>