From 942d731f633285db9fd36224ae10cf15d6ba9328 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 21 三月 2023 14:58:09 +0800
Subject: [PATCH] 用户清单导入班组字段
---
VueWebApi/Tools/ImportExcelData.cs | 7 ++++---
VueWebApi/bin/VueWebApi.xml | 17 +++++++++++++++++
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.dll | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 17 +++++++++++++++++
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
12 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index d4957c3..9cddc65 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index f5abc1e..3cee48a 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES鐏电繑</_PublishTargetUrl>
- <History>True|2023-03-06T07:38:34.5627590Z;True|2023-03-04T14:36:39.0713607+08:00;True|2023-03-04T11:02:31.6417325+08:00;True|2023-03-03T16:05:26.3953033+08:00;True|2023-02-20T19:56:38.3685951+08:00;True|2022-12-06T09:25:41.3057126+08:00;True|2022-12-06T09:16:45.3313819+08:00;True|2022-12-05T17:22:41.5632159+08:00;True|2022-12-05T17:08:31.1207925+08:00;True|2022-12-05T16:40:51.0731150+08:00;True|2022-12-05T13:17:38.4883581+08:00;True|2022-12-05T13:16:11.2439234+08:00;True|2022-12-05T13:11:31.6502410+08:00;True|2022-12-05T13:06:31.8519147+08:00;True|2022-11-28T17:29:35.0448121+08:00;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
+ <History>True|2023-03-06T23:56:08.3069899Z;True|2023-03-06T15:38:34.5627590+08:00;True|2023-03-04T14:36:39.0713607+08:00;True|2023-03-04T11:02:31.6417325+08:00;True|2023-03-03T16:05:26.3953033+08:00;True|2023-02-20T19:56:38.3685951+08:00;True|2022-12-06T09:25:41.3057126+08:00;True|2022-12-06T09:16:45.3313819+08:00;True|2022-12-05T17:22:41.5632159+08:00;True|2022-12-05T17:08:31.1207925+08:00;True|2022-12-05T16:40:51.0731150+08:00;True|2022-12-05T13:17:38.4883581+08:00;True|2022-12-05T13:16:11.2439234+08:00;True|2022-12-05T13:11:31.6502410+08:00;True|2022-12-05T13:06:31.8519147+08:00;True|2022-11-28T17:29:35.0448121+08:00;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -705,13 +705,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>03/04/2023 14:36:31</publishTime>
+ <publishTime>03/07/2023 07:55:59</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>03/04/2023 14:36:31</publishTime>
+ <publishTime>03/07/2023 07:55:59</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>03/04/2023 14:36:31</publishTime>
+ <publishTime>03/07/2023 07:55:59</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1074,7 +1074,7 @@
<publishTime>06/16/2022 13:39:23</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/06/2023 15:38:33</publishTime>
+ <publishTime>03/07/2023 07:56:07</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 3b7ffe1..4403b14 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -2835,8 +2835,8 @@
break;
}
- sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype)
- values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
+ sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
+ values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@usergroup_code)";
list.Add(new
{
str = sql,
@@ -2851,7 +2851,8 @@
Email = excelTable[1].Rows[i][6].ToString().Trim(),
Operator = User,
StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
- wagetype = WageType
+ wagetype = WageType,
+ usergroup_code = excelTable[1].Rows[i][9].ToString().Trim()
}
});
}
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index 8f35482..9bf164c 100644
--- a/VueWebApi/bin/VueWebApi.dll
+++ b/VueWebApi/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 84c7dde..498da44 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index c309f36..67e81c1 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1912,6 +1912,23 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+ </summary>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">浜у搧瑙勬牸</param>
+ <param name="creatuser">鍒涘缓浜哄憳</param>
+ <param name="createdate">鍒涘缓鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
index 8f35482..9bf164c 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 84c7dde..498da44 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index c309f36..67e81c1 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1912,6 +1912,23 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+ </summary>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">浜у搧瑙勬牸</param>
+ <param name="creatuser">鍒涘缓浜哄憳</param>
+ <param name="createdate">鍒涘缓鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index 7a1aa9f..eaf0629 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.dll b/VueWebApi/obj/Release/VueWebApi.dll
index 8f35482..9bf164c 100644
--- a/VueWebApi/obj/Release/VueWebApi.dll
+++ b/VueWebApi/obj/Release/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 84c7dde..498da44 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3