From 437b5cd5f34c9c2f16c6a939b178afe6cdb64f27 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 21 七月 2022 18:56:48 +0800
Subject: [PATCH] 用户清单导入
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/bin/VueWebApi.dll.config | 2
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 2
VueWebApi/DLL/DAL/ExcelCheckDAL.cs | 2
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 32 +++++-----
VueWebApi/Controllers/ImportExcelController.cs | 15 +++--
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 11 ++-
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Web.config | 2
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 2
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 4
VueWebApi/Logs/2022-07-21.TXT | 25 ++++++++
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 18 +++---
VueWebApi/InExcel/产品功能阶段输出.xlsx | 0
/dev/null | 0
VueWebApi/VueWebApi.csproj | 1
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/Excel/角色清单.xls | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 4
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 2
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 8 +-
24 files changed, 82 insertions(+), 48 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 29c85e9..6d7ec5b 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/ImportExcelController.cs b/VueWebApi/Controllers/ImportExcelController.cs
index 3aec6a1..546bdaf 100644
--- a/VueWebApi/Controllers/ImportExcelController.cs
+++ b/VueWebApi/Controllers/ImportExcelController.cs
@@ -38,7 +38,7 @@
list = list.Where(s => s.FileCode == FileCode).ToList();
var filename = list[0].FileName + ".xls";
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
- var msg = fileip + "/apis/Excel/" + filename;
+ var msg = fileip + "/Excel/" + filename;
mes.code = "200";
mes.data = msg;
return TJson.toJson(mes);
@@ -53,9 +53,12 @@
/// <param name="FileCode">鏂囦欢缂栫爜</param>
/// <returns></returns>
[Route(template: "ExcelModelCheck")]
- [HttpGet]
- public HttpResponseMessage ExcelModelCheck(HttpPostedFileBase files, string FileCode = null)
+ [HttpPost]
+ public HttpResponseMessage ExcelModelCheck()
{
+
+ string FileCode = HttpContext.Current.Request["FileCode"].ToString();
+ HttpPostedFile files = HttpContext.Current.Request.Files[0];
ExcelModelCheck list = new ExcelModelCheck();
Dictionary<object, object> dList = new Dictionary<object, object>();
list.json1 = ExcelCheckUpload(files, FileCode); //鏂囦欢涓婁紶
@@ -90,7 +93,7 @@
[Route(template: "ExcelCheckUpload")]
[HttpGet]
[HiddenApi]
- public ToMessage ExcelCheckUpload(HttpPostedFileBase files, string FileCode = null)
+ public ToMessage ExcelCheckUpload(HttpPostedFile files, string FileCode = null)
{
try
{
@@ -145,7 +148,7 @@
[Route(template: "ExcelCheckUpload")]
[HttpGet]
[HiddenApi]
- public ToMessage ExcelCheck(HttpPostedFileBase files, string FileCode = null)
+ public ToMessage ExcelCheck(HttpPostedFile files, string FileCode = null)
{
try
{
@@ -186,7 +189,7 @@
/// <param name="FileCode">鏂囦欢缂栫爜</param>
/// <returns></returns>
[HiddenApi]
- public ToMessage ExcelCheckCount(HttpPostedFileBase files, string FileCode = null)
+ public ToMessage ExcelCheckCount(HttpPostedFile files, string FileCode = null)
{
string savePath;
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index e2d3bbc..d9ca36d 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -564,14 +564,14 @@
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
- string checkuser = obj["checkuser"].ToString(); //妫�楠屼汉鍛�
+ string checkusercode = obj["checkusercode"].ToString(); //妫�楠屼汉鍛樼紪鐮�
string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
string data = obj["data"].ToString();
List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkuser, checktypecode, checkresult, checkdescr, username,json);
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, username,json);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 574a8e1..3856e8d 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -206,9 +206,9 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
- public static ToMessage SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkuser, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
+ public static ToMessage SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkusercode, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
{
- return ProductionManagementDAL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkuser, checktypecode, checkresult, checkdescr, username, json);
+ return ProductionManagementDAL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, username, json);
}
#endregion
}
diff --git a/VueWebApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
index 06123bc..88d2303 100644
--- a/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebApi/DLL/DAL/ExcelCheckDAL.cs
@@ -83,6 +83,8 @@
Message = ImportExcelData.TwentyOne(savePath, out StuCode);
break;
default:
+ StuCode = "300";
+ Message = "妯℃澘缂栫爜閿欒锛�";
break;
}
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 8041161..754b474 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -1373,7 +1373,7 @@
else
{
//鑾峰彇涓昏〃鏈�澶D
- sql = @"select IDENT_CURRENT('TK_Wrk_Record')+1 as id";
+ sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+1,1) as id";
var dt = DapperHelper.selecttable(sql);
//鍐欏叆寮�鎶ュ伐璁板綍琛�
sql = @"insert into TK_Wrk_Record(wo_code,step_seq,step_code,eqp_code,materiel_code,task_qty,start_qty,good_qty,ng_qty,style,lm_user,lm_date)
@@ -1467,7 +1467,7 @@
else
{
//鑾峰彇涓昏〃鏈�澶D
- sql = @"select IDENT_CURRENT('TK_Wrk_OutRecord')+1 as id";
+ sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_OutRecord')+1,1) as id";
var dt = DapperHelper.selecttable(sql);
//鍐欏叆澶栧崗璁板綍涓昏〃
sql = @"insert into TK_Wrk_OutRecord(wo_code,step_seq,step_code,wx_code,materiel_code,style,fqty,lm_user,lm_date)
@@ -1564,7 +1564,7 @@
else
{
//鑾峰彇涓昏〃鏈�澶D
- sql = @"select IDENT_CURRENT('TK_Wrk_OutRecord')+1 as id";
+ sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_OutRecord')+1,1) as id";
var dt = DapperHelper.selecttable(sql);
//鍐欏叆澶栧崗璁板綍涓昏〃
sql = @"insert into TK_Wrk_OutRecord(wo_code,step_seq,step_code,wx_code,materiel_code,style,sqty,ng_qty,lm_user,lm_date)
@@ -1748,7 +1748,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
- public static ToMessage SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkuser, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
+ public static ToMessage SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkusercode, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
{
var sql = "";
string[] arra = new string[] { };
@@ -1762,16 +1762,16 @@
list.Clear();
//鍐欏叆宸ュ簭妫�楠岃褰曚富琛�
- sql = @"insert into TStepCheckRecord(wo_code,part_code,step_code,checkstaned_code,check_user,check_type,check_result,check_descr,lm_user,lm_date)
- values(@mesordercode,@partcode,@stepcode,@checkstanedcode,@checkuser,@checktypecode,@checkresult,@checkdescr,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { mesordercode = mesordercode, partcode = partcode, stepcode = stepcode, checkstanedcode = checkstanedcode, checkuser = checkuser, checktypecode = checktypecode, checkresult = checkresult, checkdescr = checkdescr, lm_user = username, lm_date = date } });
+ sql = @"insert into TStepCheckRecord(wo_code,partcode,step_code,checkstaned_code,check_user,check_type,check_result,check_descr,lm_user,lm_date)
+ values(@mesordercode,@partcode,@stepcode,@checkstanedcode,@checkusercode,@checktypecode,@checkresult,@checkdescr,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { mesordercode = mesordercode, partcode = partcode, stepcode = stepcode, checkstanedcode = checkstanedcode, checkusercode = checkusercode, checktypecode = checktypecode, checkresult = checkresult, checkdescr = checkdescr, lm_user = username, lm_date = date } });
//鍐欏叆宸ュ簭妫�楠岃褰曞瓙琛�
//鑾峰彇涓昏〃鏈�澶D
- sql = @"select IDENT_CURRENT('TStepCheckRecord')+1 as id";
+ sql = @"select ISNULL(IDENT_CURRENT('TStepCheckRecord')+1,1) as id";
var dt = DapperHelper.selecttable(sql);
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TStepCheckRecordSub(m_id,checkiem_seq,checkitem_code,checkitem_name,checkitem_descr,check_result,lm_user,lm_date)
+ sql = @"insert into TStepCheckRecordSub(m_id,checkitem_seq,checkitem_code,checkitem_name,checkitem_descr,check_result,lm_user,lm_date)
values(@m_id,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_result,@lm_user,@lm_date)";
list.Add(new { str = sql, parm = new { m_id = int.Parse(dt.Rows[0]["ID"].ToString()), checkiem_seq = int.Parse(json[i].seq), checkitem_code = json[i].code, checkitem_name = json[i].name, checkitem_descr = json[i].descr, check_result = json[i].checkresult, lm_user = username, lm_date = date } });
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index aee0a95..8e6d5f0 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -29,7 +29,7 @@
{
if (defectcode != "" && defectcode != null)
{
- search += "and A.code=@defectcode ";
+ search += "and A.code like '%'+@defectcode+'%' ";
dynamicParams.Add("@defectcode", defectcode);
}
if (defectname != "" && defectname != null)
@@ -211,7 +211,7 @@
{
if (stanedcode != "" && stanedcode != null)
{
- search += "and A.code=@stanedcode ";
+ search += "and A.code like '%'+@stanedcode+'%' ";
dynamicParams.Add("@stanedcode", stanedcode);
}
if (stanedname != "" && stanedname != null)
@@ -414,7 +414,7 @@
if (opertype == "Update")
{
//鍒犻櫎宸ュ簭妫�楠屾爣鍑嗗瓙琛�
- sql = @"delete from TStepCheckStandard where code=@stepstaned_code";
+ sql = @"delete from TStepCheckStandardSub where stepstaned_code=@stepstaned_code";
list.Add(new { str = sql, parm = new { stepstaned_code = json.code} });
//淇敼宸ュ簭妫�楠屾爣鍑嗕富琛�
sql = @"update TStepCheckStandard set name=@stepstaned_name,descr=@stepstaned_desc where code=@stepstaned_code";
@@ -467,7 +467,7 @@
{
if (itemcode != "" && itemcode != null)
{
- search += "and A.code=@itemcode ";
+ search += "and A.code like '%'+@itemcode+'%' ";
dynamicParams.Add("@itemcode", itemcode);
}
if (itemname != "" && itemname != null)
diff --git "a/VueWebApi/InExcel/\344\272\247\345\223\201\345\212\237\350\203\275\351\230\266\346\256\265\350\276\223\345\207\272.xlsx" "b/VueWebApi/InExcel/\344\272\247\345\223\201\345\212\237\350\203\275\351\230\266\346\256\265\350\276\223\345\207\272.xlsx"
new file mode 100644
index 0000000..71eec4a
--- /dev/null
+++ "b/VueWebApi/InExcel/\344\272\247\345\223\201\345\212\237\350\203\275\351\230\266\346\256\265\350\276\223\345\207\272.xlsx"
Binary files differ
diff --git a/VueWebApi/Logs/2022-07-21.TXT b/VueWebApi/Logs/2022-07-21.TXT
new file mode 100644
index 0000000..cad618a
--- /dev/null
+++ b/VueWebApi/Logs/2022-07-21.TXT
@@ -0,0 +1,25 @@
+ 【时间】:2022-07-21 11:08:42,220
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 11
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第26行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：不允许从数据类型 nvarchar 到 varbinary 的隐式转换。请使用 CONVERT 函数来运行此查询。
+引发异常路径：/api/ProductionManagement/SaveMesOrderStepCheckItem
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
+ 在 Dapper.SqlMapper.ExecuteCommand(IDbConnection cnn, CommandDefinition& command, Action`2 paramReader)
+ 在 Dapper.SqlMapper.ExecuteImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.Execute(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.DoTransaction(List`1 sqlList) 位置 D:\新凯迪MES\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 425
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 75ace4c..e207cee 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/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-07-14T06:34:28.5093226Z;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-07-21T09:53:41.1464086Z;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">
@@ -384,13 +384,13 @@
<publishTime>11/28/2018 13:04:24</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>07/20/2022 11:38:44</publishTime>
+ <publishTime>07/21/2022 17:53:36</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>07/20/2022 11:38:44</publishTime>
+ <publishTime>07/21/2022 17:53:36</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
<publishTime>06/16/2022 14:26:01</publishTime>
@@ -463,6 +463,9 @@
</File>
<File Include="Excel/鐢ㄦ埛娓呭崟.xls">
<publishTime>07/20/2022 10:52:30</publishTime>
+ </File>
+ <File Include="Excel/瑙掕壊娓呭崟.xls">
+ <publishTime>07/20/2022 11:30:06</publishTime>
</File>
<File Include="favicon.ico">
<publishTime>06/10/2022 08:20:24</publishTime>
@@ -963,7 +966,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/30/2022 15:04:41</publishTime>
+ <publishTime>07/21/2022 17:53:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 2644a8c..50959e4 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -375,6 +375,7 @@
<Content Include="grf\鎶ュ伐浜у嚭鏍囩.grf" />
<Content Include="grf\鎶ュ伐鎵撳嵃鏍囩.grf" />
<Content Include="grf\澶栧崗鏀舵枡鏍囩.grf" />
+ <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" />
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index 83a6f91..39cfa39 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -62,7 +62,7 @@
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷-->
- <mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>
+ <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>-->
</staticContent>
<handlers>
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index 83a6f91..39cfa39 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -62,7 +62,7 @@
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷-->
- <mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>
+ <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>-->
</staticContent>
<handlers>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index ae9d02e..9096656 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.CopyComplete b/VueWebApi/obj/Debug/VueWebApi.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.CopyComplete
+++ /dev/null
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index 13b0c61..47fcfb0 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..3ae6545
--- /dev/null
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls"
new file mode 100644
index 0000000..73e21a0
--- /dev/null
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index cbf5cca..48bcd0b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -62,7 +62,7 @@
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷-->
- <mimeMap fileExtension=".grf" mimeType="grf/gridreport" />
+ <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>-->
</staticContent>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index ae9d02e..9096656 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/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index 83a6f91..39cfa39 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -62,7 +62,7 @@
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷-->
- <mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>
+ <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>-->
</staticContent>
<handlers>
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index cbf5cca..48bcd0b 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -62,7 +62,7 @@
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷-->
- <mimeMap fileExtension=".grf" mimeType="grf/gridreport" />
+ <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>-->
</staticContent>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 09b1caa..3dfc178 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -1,5 +1,3 @@
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.dll.config
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.pdb
@@ -28,11 +26,14 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.FileVersionInfo.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.StackTrace.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Globalization.Calendars.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.ZipFile.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.Primitives.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Net.Http.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Net.Sockets.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Reflection.Metadata.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Algorithms.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Encoding.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Primitives.dll
@@ -49,17 +50,11 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\vbc.rsp
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe.config
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.IO.Compression.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.RuntimeInformation.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Net.Http.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Antlr3.Runtime.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Dapper.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Web.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\JWT.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\log4net.dll
@@ -80,11 +75,13 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Swashbuckle.Core.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Buffers.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Diagnostics.PerformanceCounter.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.IO.Compression.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.IO.Pipelines.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Memory.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Net.Http.Formatting.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Numerics.Vectors.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.Unsafe.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.RuntimeInformation.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Threading.Channels.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Threading.Tasks.Extensions.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Web.Cors.dll
@@ -100,8 +97,12 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\System.Web.WebPages.Razor.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\WebActivatorEx.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\WebGrease.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Bars.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Editor.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Dapper.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Web.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.pdb
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\JWT.pdb
@@ -153,9 +154,8 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Web.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Bars.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Editor.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.xml
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\FastReport.Web.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index ae9d02e..9096656 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3