yl
2022-08-04 e99d99e277871729e1af52ecb24c2a8cbb08158c
修改唯一登录接口
已添加2个文件
已修改13个文件
228 ■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/KanBanManagerentController.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/LoginController.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/LoginDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Logs/2022-08-03.TXT 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Logs/2022-08-04.TXT 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Tools/ChannelActionFilterAttribute.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/Controllers/KanBanManagerentController.cs
@@ -90,5 +90,48 @@
        }
        #endregion
        #region[采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数]
        /// <summary>
        /// 采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数
        /// </summary>
        /// <returns></returns>
        [Route(template: "PurchaseLeftTop")]
        [HttpGet]
        public HttpResponseMessage PurchaseLeftTop()
        {
            mes = KanBanManagerentBLL.PurchaseLeftTop();
            return TJson.toJson(mes);
        }
        #endregion
        #region[采购订单跟踪管理看板,左下采购订单跟踪列表]
        /// <summary>
        /// 采购订单跟踪管理看板,左下采购订单跟踪列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "PurchaseLeftBottom")]
        [HttpGet]
        public HttpResponseMessage PurchaseLeftBottom()
        {
            mes = KanBanManagerentBLL.PurchaseLeftBottom();
            return TJson.toJson(mes);
        }
        #endregion
        #region[采购订单跟踪管理看板,右侧Top]
        /// <summary>
        /// 采购订单跟踪管理看板,右侧Top
        /// </summary>
        /// <returns></returns>
        [Route(template: "PurchaseRight")]
        [HttpGet]
        public HttpResponseMessage PurchaseRight()
        {
            mes = KanBanManagerentBLL.PurchaseRight();
            return TJson.toJson(mes);
        }
        #endregion
    }
}
VueWebApi/Controllers/LoginController.cs
@@ -38,7 +38,7 @@
                {
                    List<User> mss = new List<User>();
                    User ms = new User();
                    //ms.guid=Guid.NewGuid().ToString();
                    ms.guid = username + password + Guid.NewGuid().ToString();
                    ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
                    ms.usercode = dt.Rows[0]["USERCODE"].ToString();
                    ms.username = dt.Rows[0]["USERNAME"].ToString();
@@ -124,7 +124,7 @@
        {
            try
            {
                redis.Remove("LoginUserID"+usertype+ userid, 0); //删除redis
                redis.Remove("LoginUserID" + usertype + userid, 0); //删除redis
                mes.code = "200";
                mes.count = 0;
                mes.Message = "强制下线成功!";
@@ -194,6 +194,7 @@
        /// <returns></returns>
        [Route(template: "LoginOut")]
        [HttpPost]
        [ChannelActionFilter]
        public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype)
        {
            mes = LoginBLL.LoginOut(userid, usercode, username, usertype);
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -45,5 +45,28 @@
            return KanBanManagerentDAL.LineSearchBottomRightData();
        }
        #endregion
        #region[采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数]
        public static ToMessage PurchaseLeftTop()
        {
            return KanBanManagerentDAL.PurchaseLeftTop();
        }
        #endregion
        #region[采购订单跟踪管理看板,左下采购订单跟踪列表]
        public static ToMessage PurchaseLeftBottom()
        {
            return KanBanManagerentDAL.PurchaseLeftBottom();
        }
        #endregion
        #region[采购订单跟踪管理看板,右侧Top]
        public static ToMessage PurchaseRight()
        {
            return KanBanManagerentDAL.PurchaseRight();
        }
        #endregion
    }
}
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -223,17 +223,20 @@
            try
            {
                //获取产品报工top5信息
                sql = @"select top 5 A.partname,isnull(sum(A.good_qty),0) as good_qty from(
                           select M.partname,A.good_qty  from TK_Wrk_Record A
                           inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
                           inner join TMateriel_Info M on A.materiel_code=M.partcode
                           where A.style='B' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
                           union all
                           select M.partname,A.sqty as good_qty  from TK_Wrk_OutRecord A
                           inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
                           inner join TMateriel_Info M on A.materiel_code=M.partcode
                           where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
                           ) as A group by A.partname order by good_qty desc";
                sql = @"select top 5 A.org_name as wkshname,A.name as linename,A.partname,isnull(sum(A.good_qty),0) as good_qty from(
                        select W.org_name,E.name,M.partname,A.good_qty  from TK_Wrk_Record A
                        inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
                        inner join TMateriel_Info M on A.materiel_code=M.partcode
                        inner  join TEqpInfo E on A.eqp_code=E.code
                        inner  join TOrganization W on E.wksp_code=W.org_code and W.description='W'
                        where A.style='B' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
                        union all
                        select C.name as linename,'' as wkshname,M.partname,A.sqty as good_qty  from TK_Wrk_OutRecord A
                        inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
                        inner join TMateriel_Info M on A.materiel_code=M.partcode
                        inner  join TCustomer C on A.wx_code=C.code and C.btype='WX'
                        where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
                        ) as A group by A.org_name,A.name,A.partname order by good_qty desc";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -258,8 +261,84 @@
            try
            {
                //获取报工不良top5信息
                sql = @"select isnull(COUNT(checkitem_name),0) cont,checkitem_name  from TStepCheckRecordSub where DateDiff(dd,lm_date,getdate())<=7
                        group by checkitem_name order by cont desc";
                sql = @"select isnull(COUNT(B.name),0) cont,B.name
                        from CSR_WorkRecord_Defect A
                        inner join TDefect B on A.defect_code=B.code
                        where DateDiff(dd,A.lm_date,getdate())<=7
                        group by B.name order by cont desc";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数]
        public static ToMessage PurchaseLeftTop()
        {
            string sql = "";
            try
            {
                //获取本月采购订单数、本月采购进货单数、本月采购入库单数
                sql = @"select * from h_v_DDKanBan_PurchaseLeftTop ";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[采购订单跟踪管理看板,左下采购订单跟踪列表]
        public static ToMessage PurchaseLeftBottom()
        {
            string sql = "";
            try
            {
                //获取采购订单跟踪列表
                sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom ";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[采购订单跟踪管理看板,右侧Top]
        public static ToMessage PurchaseRight()
        {
            string sql = "";
            try
            {
                //获取采购订单跟踪列表
                sql = @"select * from h_v_DDKanBan_PurchaseRight ";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
VueWebApi/DLL/DAL/LoginDAL.cs
@@ -228,7 +228,7 @@
                cont = DapperHelper.SQL(sql, dynamicParams);
                if (cont > 0)
                {
                    redis.Remove("LoginUserID" + userid, 0); //删除redis
                    redis.Remove("LoginUserID" + usertype + userid, 0); //删除redis
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "登出成功!";
VueWebApi/Logs/2022-08-03.TXT
VueWebApi/Logs/2022-08-04.TXT
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\XKDMesApi</_PublishTargetUrl>
    <History>True|2022-08-02T11:17:55.0460145Z;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
    <History>True|2022-08-04T07:24:38.8785046Z;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -696,16 +696,16 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>08/02/2022 19:17:49</publishTime>
      <publishTime>08/04/2022 15:24:33</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>08/02/2022 19:17:49</publishTime>
      <publishTime>08/04/2022 15:24:33</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>08/02/2022 19:17:49</publishTime>
      <publishTime>08/04/2022 15:24:33</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1287,7 +1287,7 @@
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/02/2022 19:17:54</publishTime>
      <publishTime>08/04/2022 15:24:38</publishTime>
    </File>
  </ItemGroup>
</Project>
VueWebApi/Tools/ChannelActionFilterAttribute.cs
@@ -36,8 +36,8 @@
                {
                    //获取redis中当前用户信息
                    User r_loginUser = redis.Get<User>("LoginUserIDPC" + loginUser.userid, 0);
                    //如果session中的用户usercode和redis中的用户usercode匹配
                    if (r_loginUser.usercode.Equals(loginUser.usercode))
                    //如果session中的用户guid和redis中的用户guid匹配
                    if (r_loginUser.guid.Equals(loginUser.guid))
                    {
                        //重置过期时间
                        redis.Set<User>("LoginUserIDPC" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
VueWebApi/bin/VueWebApi.pdb
Binary files differ
VueWebApi/bin/VueWebApi.xml
@@ -1002,6 +1002,24 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftTop">
            <summary>
            采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftBottom">
            <summary>
            采购订单跟踪管理看板,左下采购订单跟踪列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseRight">
            <summary>
            采购订单跟踪管理看板,右侧Top
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String)">
            <summary>
            用户登录
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1002,6 +1002,24 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftTop">
            <summary>
            采购订单跟踪管理看板,左上本月采购订单数、本月采购进货单数、本月采购入库单数
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftBottom">
            <summary>
            采购订单跟踪管理看板,左下采购订单跟踪列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseRight">
            <summary>
            采购订单跟踪管理看板,右侧Top
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String)">
            <summary>
            用户登录
VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ