yl
2022-08-12 ff2d682273e71c9d1f01ea8405116396da87a259
大岛仓库看板接口
已添加18个文件
已修改23个文件
451 ■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/KanBanManagerentController.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Excel/缺陷定义.xls 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Tools/ImportExcelData.cs 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/VueWebApi.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Excel/缺陷定义.xls 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/1.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/2.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/3.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/4.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/5.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/6.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/7.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/8.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/9.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1_1.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1_2.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_3_1.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_3_2.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4_1.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4_2.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/Controllers/KanBanManagerentController.cs
@@ -133,5 +133,63 @@
            return TJson.toJson(mes);
        }
        #endregion
        #region[大岛仓库看板,左上产品待入库列表]
        /// <summary>
        /// å¤§å²›ä»“库看板,左上产品待入库列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseTopLeftData")]
        [HttpGet]
        public HttpResponseMessage WareHouseTopLeftData()
        {
            mes = KanBanManagerentBLL.WareHouseTopLeftData();
            return TJson.toJson(mes);
        }
        #endregion
        #region[大岛仓库看板,左下产品待发货列表]
        /// <summary>
        /// å¤§å²›ä»“库看板,左下产品待发货列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseTopBottomData")]
        [HttpGet]
        public HttpResponseMessage WareHouseTopBottomData()
        {
            mes = KanBanManagerentBLL.WareHouseTopBottomData();
            return TJson.toJson(mes);
        }
        #endregion
        #region[大岛仓库看板,右上成品库、半成品库top5库存排行]
        /// <summary>
        /// å¤§å²›ä»“库看板,右上成品库、半成品库top5库存排行
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseRightTopData")]
        [HttpGet]
        public HttpResponseMessage WareHouseRightTopData()
        {
            mes = KanBanManagerentBLL.WareHouseRightTopData();
            return TJson.toJson(mes);
        }
        #endregion
        #region[大岛仓库看板,右下原料库库top5库存排行]
        /// <summary>
        /// å¤§å²›ä»“库看板,右下原料库库top5库存排行
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseRightBottomData")]
        [HttpGet]
        public HttpResponseMessage WareHouseRightBottomData()
        {
            mes = KanBanManagerentBLL.WareHouseRightBottomData();
            return TJson.toJson(mes);
        }
        #endregion
    }
}
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -68,5 +68,35 @@
            return KanBanManagerentDAL.PurchaseRight();
        }
        #endregion
        #region[大岛仓库看板,左上产品待入库列表]
        public static ToMessage WareHouseTopLeftData()
        {
            return KanBanManagerentDAL.WareHouseTopLeftData();
        }
        #endregion
        #region[大岛仓库看板,左下产品待发货列表]
        public static ToMessage WareHouseTopBottomData()
        {
            return KanBanManagerentDAL.WareHouseTopBottomData();
        }
        #endregion
        #region[大岛仓库看板,右上成品库、半成品库top5库存排行]
        public static ToMessage WareHouseRightTopData()
        {
            return KanBanManagerentDAL.WareHouseRightTopData();
        }
        #endregion
        #region[大岛仓库看板,右下原料库库top5库存排行]
        public static ToMessage WareHouseRightBottomData()
        {
            return KanBanManagerentDAL.WareHouseRightBottomData();
        }
        #endregion
    }
}
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -354,5 +354,101 @@
            return mes;
        }
        #endregion
        #region[大岛仓库看板,左上产品待入库列表]
        public static ToMessage WareHouseTopLeftData()
        {
            string sql = "";
            try
            {
                //获取仓库生产加工单待入库列表
                sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
                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 WareHouseTopBottomData()
        {
            string sql = "";
            try
            {
                //获取仓库生产加工单待入库列表
                sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
                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[大岛仓库看板,右上成品库、半成品库top5库存排行]
        public static ToMessage WareHouseRightTopData()
        {
            string sql = "";
            try
            {
                sql = @"select * from h_v_DDKanBan_WareHouseRightTop";
                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[大岛仓库看板,右下原料库库top5库存排行]
        public static ToMessage WareHouseRightBottomData()
        {
            string sql = "";
            try
            {
                sql = @"select * from h_v_DDKanBan_WareHouseRightBottom";
                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
    }
}
VueWebApi/Excel/ȱÏݶ¨Òå.xls
Binary files differ
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-11T01:06:08.8394009Z;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;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>
    <History>True|2022-08-12T09:15:09.2133281Z;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;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/11/2022 09:06:03</publishTime>
      <publishTime>08/12/2022 17:15:04</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>08/11/2022 09:06:03</publishTime>
      <publishTime>08/12/2022 17:15:04</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>08/11/2022 09:06:03</publishTime>
      <publishTime>08/12/2022 17:15:03</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -781,6 +781,9 @@
    </File>
    <File Include="Excel/用户清单.xls">
      <publishTime>07/20/2022 10:52:30</publishTime>
    </File>
    <File Include="Excel/缺陷定义.xls">
      <publishTime>08/12/2022 10:41:48</publishTime>
    </File>
    <File Include="Excel/角色清单.xls">
      <publishTime>07/22/2022 11:26:24</publishTime>
@@ -1229,32 +1232,77 @@
    <File Include="Grid/webapp-ws-tutorial.htm">
      <publishTime>07/08/2022 15:15:11</publishTime>
    </File>
    <File Include="Image/app_1.png">
    <File Include="Image/1.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/2.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/3.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/4.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/5.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/6.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/7.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/8.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/9.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/app_1.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_1_1.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_1_2.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_2.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_3.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_3_1.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_3_2.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_4.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_4_1.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_4_2.png">
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_5.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_6.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_7.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_8.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="Image/app_9.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
      <publishTime>08/11/2022 18:36:37</publishTime>
    </File>
    <File Include="index.html">
      <publishTime>06/30/2022 14:02:46</publishTime>
@@ -1314,7 +1362,7 @@
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/11/2022 09:06:08</publishTime>
      <publishTime>08/12/2022 17:15:08</publishTime>
    </File>
  </ItemGroup>
</Project>
VueWebApi/Tools/ImportExcelData.cs
@@ -1322,73 +1322,39 @@
            if (excelTable.Count != 2)
            {
                code = "300";
                Message = "模板不符合规范,缺失的Sheet";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;
            }
            else if (excelTable[0].Columns.Count != 4)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
            }
            else if (excelTable[1].Columns.Count != 7)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
                Message = "缺陷定义模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "缺陷定义模板不符合规范:表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "物料编码(唯一)")
            else if (excelTable[0].Columns[1].ColumnName != "缺陷编号(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "缺陷定义模板不符合规范:表头信息不符合规范,第2列应为{缺陷编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "物料名称")
            else if (excelTable[0].Columns[2].ColumnName != "缺陷名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "缺陷定义模板不符合规范:表头信息不符合规范,第3列应为{缺陷名称}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "启用状态")
            else if (excelTable[0].Columns[3].ColumnName != "缺陷描述")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[1].ColumnName != "物料信息序号")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[2].ColumnName != "缺陷代码(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[3].ColumnName != "缺陷名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[4].ColumnName != "主工艺路线")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[5].ColumnName != "责任工序编码")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[6].ColumnName != "责任工序名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "缺陷描述模板不符合规范:表头信息不符合规范,第4列应为{缺陷描述}";
                return Message;
            }
            else
            {
@@ -2131,8 +2097,46 @@
            count = 0;
            string sql = "";
            DataTable dt;
            var dynamicParams = new DynamicParameters();
            List<ExcelErro> list = new List<ExcelErro>();
            DataTable excelTable = new DataTable();
            list = ImportExcel.ExcelToTableErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTable(FileCode);  //获取Excel数据
            for (int i = 0; i < excelTable.Rows.Count; i++)
            {
                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
                {
                    sql = @"select code  from TDefect where code=@code";
                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{缺陷定义编号(唯一)}";
                        erro.ErrorCont = "缺陷定义表:{缺陷定义编号(唯一)}字段" + excelTable.Rows[i][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            if (list.Count > 0)
            {
                int index = 0;
                foreach (ExcelErro item in list)
                {
                    index++;
                    item.Seq = index.ToString();
                }
                StuCode = "301";
                message = "数据验证失败";
            }
            else
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable.Rows.Count;
            }
            return list;
        }
        #endregion
@@ -2750,9 +2754,44 @@
        {
            string message = "";
            StuCode = "";
            string sql = "";
            DataTable dt;
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                DataTable excelTable = new DataTable();
                excelTable = ImportExcel.ExcelToTable(FileCode);
                //导入往来单位表
                for (int i = 0; i < excelTable.Rows.Count; i++)
                {
                    sql = @"insert into TDefect(code,name,descr,lm_user,lm_date)
                            values(@code,@name,@descr,@Operator,@CreateDate)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            code = excelTable.Rows[i][1].ToString().Trim(),
                            name = excelTable.Rows[i][2].ToString().Trim(),
                            descr = excelTable.Rows[i][3].ToString().Trim(),
                            Operator = User,
                            CreateDate = DateTime.Now.ToString()
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    StuCode = "200";
                    message = "导入成功!";
                }
                else
                {
                    StuCode = "300";
                    message = "导入失败!";
                }
            }
            catch (Exception e)
            {
VueWebApi/VueWebApi.csproj
@@ -434,6 +434,7 @@
    <Content Include="Excel\仓库库位清单.xls" />
    <Content Include="Excel\往来单位.xls" />
    <Content Include="grf\Rework.frx" />
    <Content Include="Excel\缺陷定义.xls" />
    <None Include="Scripts\jquery-3.4.1.intellisense.js" />
    <Content Include="Scripts\jquery-3.4.1.js" />
    <Content Include="Scripts\jquery-3.4.1.min.js" />
VueWebApi/bin/VueWebApi.pdb
Binary files differ
VueWebApi/bin/VueWebApi.xml
@@ -1020,6 +1020,30 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
            <summary>
            å¤§å²›ä»“库看板,左上产品待入库列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
            <summary>
            å¤§å²›ä»“库看板,左下产品待发货列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
            <summary>
            å¤§å²›ä»“库看板,右上成品库、半成品库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
            <summary>
            å¤§å²›ä»“库看板,右下原料库库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
            <summary>
            ç”¨æˆ·ç™»å½•
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/Excel/ȱÏݶ¨Òå.xls
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/Image/1.png
VueWebApi/obj/Release/Package/PackageTmp/Image/2.png
VueWebApi/obj/Release/Package/PackageTmp/Image/3.png
VueWebApi/obj/Release/Package/PackageTmp/Image/4.png
VueWebApi/obj/Release/Package/PackageTmp/Image/5.png
VueWebApi/obj/Release/Package/PackageTmp/Image/6.png
VueWebApi/obj/Release/Package/PackageTmp/Image/7.png
VueWebApi/obj/Release/Package/PackageTmp/Image/8.png
VueWebApi/obj/Release/Package/PackageTmp/Image/9.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_1_1.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1_2.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_3_1.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_3_2.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_4_1.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4_2.png
VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png

VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png

VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1020,6 +1020,30 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
            <summary>
            å¤§å²›ä»“库看板,左上产品待入库列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
            <summary>
            å¤§å²›ä»“库看板,左下产品待发货列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
            <summary>
            å¤§å²›ä»“库看板,右上成品库、半成品库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
            <summary>
            å¤§å²›ä»“库看板,右下原料库库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
            <summary>
            ç”¨æˆ·ç™»å½•
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -265,6 +265,7 @@
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ