YL
2021-08-24 8bbba0f6f4591251f425e3d344831ee35ab77978
nothing
6个文件已修改
1个文件已添加
195 ■■■■ 已修改文件
Model/生产管理/模具管理/ClsSc_MouldMaintainRuleBillSub_Item.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/WebClsPub.cs 147 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/Pub_Class.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainRuleBillSub_Item.cs
@@ -8,7 +8,7 @@
    {
        //============
        
        public Int64 HMaintainItemID;//  int  --保养项目ID
        public Int64 HMaintainItemID;//  int  --保养项目ID
        public string HMaintainItem;//  varchar(100)  --保养项目
        public string HMaintainPart;//  varchar(100)  --保养部位
        public string HClaim;//       varchar(100)       --具体要求
Pub_Class/CustomerCls/WebClsPub.cs
New file
@@ -0,0 +1,147 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
namespace Pub_Class
{
    public class WebClsPub
    {
        public static string ComputerName;
        public static string IPAddress;
        //判断是都存在权限,并写入日志
        public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName,ref string StrMessage)
        {
            //gnsy åŠŸèƒ½ç´¢å¼•,模块
            //usercode å½“前用户代码
            //LogTF 1判断权限并写日志,2只写日志,3只判断权限
            //Msg æ²¡æœ‰æƒé™æ—¶ æ˜¯å¦æç¤ºæ¡†
            string UserID = CurUserName;
            try
            {
                ClsSqlHelper oCn = new ClsSqlHelper();
                DataSet Ds = new DataSet();
                DataSet DsUser = new DataSet();
                DataSet DsJS = new DataSet();//角色
                long ModID = 0;
                bool HavRight = false;
                //找到模块权限
                Ds = oCn.RunProcReturn("select * from xt_xtgnb where gnsy='" + gnsy.Trim() + "'", "xt_xtgnb");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    if (Msg == true)
                    {
                        StrMessage="没有找到该功能模块!";
                    }
                    return false;
                }
                else
                {
                    ModID = ClsPub.isLong(Ds.Tables[0].Rows[0]["ID"].ToString());  //返回模块
                }
                if (LogTF == 1 || LogTF == 3)//需要判断权限
                {
                    //根据用户名称判断权限
                    DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
                    if (DsUser.Tables[0].Rows.Count == 0)
                    {
                        if (Msg == true)
                        {
                            StrMessage = "没有找到当前操作员!";
                        }
                        return false;
                    }
                    //根据用户名称判断权限
                    if ((bool)DsUser.Tables[0].Rows[0]["ManagerFlag"])  //是否管理员
                    {
                        HavRight = true;
                    }
                    else
                    {
                        if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
                        {
                            HavRight = true;
                        }
                        else
                        {
                            //获取用户组  å¹¶å¾ªçŽ¯åˆ¤æ–­æƒé™
                            //判断角色是否有权限
                            DsJS = oCn.RunProcReturn("select isnull(AuthorityID,'') AuthorityID from System_UserGroupinfo a inner join System_UserGroup b on a.GroupID=b.GroupID " +
                                " Where a.USERID='" + UserID.Trim() + "'", "gy_czygl");
                            if (DsJS == null)
                            {
                                HavRight = false;
                            }
                            else
                            {
                                HavRight = false;
                                for (int i = 0; i < DsJS.Tables[0].Rows.Count; i++)
                                {
                                    if (ClsPub.isStrNull(DsJS.Tables[0].Rows[i]["AuthorityID"]).Length > ModID)
                                    {
                                        if (DsJS.Tables[0].Rows[i]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
                                        {
                                            HavRight = true;
                                            break;
                                        }
                                    }
                                }
                            }
                        }
                    }
                    if (HavRight == false)
                    {
                        if (Msg == true)
                        {
                            StrMessage = "您没有权限,请与管理员联系!";
                        }
                    }
                }
                //需要写入日志
                if ((LogTF == 1 && HavRight) || LogTF == 2)
                {
                    Add_Log(Ds.Tables[0].Rows[0]["id"].ToString().Trim(), gnsy + "," + Ds.Tables[0].Rows[0]["gnmc"].ToString().Trim(), CurUserName, ref  StrMessage);
                }
                return HavRight;
            }
            catch (Exception e)
            {
                if (Msg == true)
                {
                    StrMessage = "判断权限时发现错误,请与管理员联系!";
                }
                return false;
            }
        }
        //写入日志
        /// <summary>
        /// å†™å…¥æ—¥å¿—
        /// </summary>
        /// <param name="UserID">无用</param>
        /// <param name="WorkList">操作日志</param>
        /// <param name="CurUserName">操作员</param>
        /// <returns></returns>
        public static bool Add_Log(string UserID, string WorkList, string CurUserName,ref string StrMessage)
        {
            ClsSqlHelper oCn = new ClsSqlHelper();
            try
            {
                oCn.RunProc("Insert into  System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
                    "(getdate(),'" + CurUserName + "','" + ComputerName + "','" + WorkList + "','ERP系统','" + IPAddress + "','进入')"
                    );
                return true;
            }
            catch (Exception e)
            {
                StrMessage = "写入日志时发现错,原因是:" + e.Message;
                return false;
            }
        }
    }
}
Pub_Class/Pub_Class.csproj
@@ -87,6 +87,7 @@
    <Compile Include="CustomerCls\ClsPub.cs" />
    <Compile Include="CustomerCls\Cell.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="CustomerCls\WebClsPub.cs" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="stdole">
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -186,6 +186,7 @@
            }
        }
        #endregion
        #region [设备点检记录表删除功能]
        /// <summary>
        /// æ¨¡å…·ç»´ä¿®å•删除功能
@@ -279,6 +280,7 @@
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion
        #region[设备点检记录表编辑时获取表题数据]
        [Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai")]
        [HttpGet]
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -913,12 +913,13 @@
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                string StrMessage = "";
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!WebClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName,ref  StrMessage))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.Message = StrMessage;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -2693,7 +2693,7 @@
                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
               //获取配件项目编辑数据
                string sql1 = "select HMaterID, é…ä»¶ä»£ç  HMaterNumber,配件名称 HMaterName,规格型号 HMaterSpec,HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,实际用量 HQty,标准用量 HQtyMust,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark  from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
                ds1 = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillList");
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/23/2021 12:09:10</publishTime>
      <publishTime>08/24/2021 15:02:10</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/23/2021 12:09:10</publishTime>
      <publishTime>08/24/2021 15:02:10</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/23/2021 12:09:08</publishTime>
      <publishTime>08/24/2021 15:02:08</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/23/2021 12:09:08</publishTime>
      <publishTime>08/24/2021 15:02:08</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/23/2021 12:09:06</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/23/2021 12:09:06</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/23/2021 12:09:09</publishTime>
      <publishTime>08/24/2021 15:02:09</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/09/2021 09:06:25</publishTime>
@@ -60,10 +60,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/23/2021 12:09:06</publishTime>
      <publishTime>08/24/2021 15:02:07</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/23/2021 12:09:06</publishTime>
      <publishTime>08/24/2021 15:02:07</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/09/2021 09:06:27</publishTime>
@@ -72,22 +72,22 @@
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:05</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:05</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/23/2021 12:09:05</publishTime>
      <publishTime>08/24/2021 15:02:06</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/23/2021 12:09:12</publishTime>
      <publishTime>08/24/2021 15:02:11</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/23/2021 12:09:12</publishTime>
      <publishTime>08/24/2021 15:02:11</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/23/2021 12:09:20</publishTime>
      <publishTime>08/24/2021 15:02:18</publishTime>
    </File>
  </ItemGroup>
</Project>