From f10feb72cae8d10d2e05ca8919b791a8f38dd763 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 03 十一月 2022 18:01:51 +0800
Subject: [PATCH] 安灯报表报错问题修改 设备点检标准导入，模板验证、数据验证接口开发
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Excel/设备清单.xls | 0
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 28 ++++
VueWebApi/Logs/2022-11-03.TXT | 30 ++++
VueWebApi/Controllers/ReportManagerController.cs | 12 +
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/DLL/BLL/BasicSettingBLL.cs | 10 +
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 8
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Tools/ImportExcelData.cs | 175 ++++++++++++++++++++++--
VueWebApi/bin/VueWebApi.xml | 13 +
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ReportManagerBLL.cs | 8
VueWebApi/Controllers/ProductionManagementController.cs | 1
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 4
VueWebApi/Controllers/BasicSettingController.cs | 17 ++
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 13 +
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 68 +++++----
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/LoginController.cs | 3
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 4
22 files changed, 330 insertions(+), 65 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index eeab61c..1af62e2 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e3824cd..effefd6 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -774,5 +774,22 @@
return TJson.toJson(mes);
}
#endregion
+
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ /// <summary>
+ /// 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+ /// </summary>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WhkspIsEqpSearch")]
+ [HttpGet]
+ public HttpResponseMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ mes = BasicSettingBLL.WhkspIsEqpSearch(wkshpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index 61dbed8..94987c1 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -374,7 +374,8 @@
public HttpResponseMessage LoginAppAnDonMessage(string rid, string usercode, string username, string usertype)
{
mes = LoginBLL.LoginAppAnDonMessage(rid, usercode, username, usertype);
- return mes.ResponseMess(mes);
+ return TJson.toJson(mes);
+ //return mes.ResponseMess(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index e087eb5..7abb905 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -709,6 +709,7 @@
#endregion
+
#region[浜ц兘瑙勫垝鏂规璁剧疆鏌ヨ]
/// <summary>
/// 浜ц兘瑙勫垝鏂规璁剧疆鏌ヨ
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 462eb8c..213bc99 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -11,7 +11,7 @@
{
[RoutePrefix(prefix: "api/ReportManager")]
[ControllerGroup("鎶ヨ〃绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- [ChannelActionFilter]
+ //[ChannelActionFilter]
public class ReportManagerController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -467,13 +467,14 @@
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
/// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
/// <param name="calldate">鍛煎彨鏃堕棿</param>
/// <param name="responddate">鍝嶅簲鏃堕棿</param>
/// <returns></returns>
[Route(template: "AnDonReportSumSearch")]
[HttpGet]
- public HttpResponseMessage AnDonReportSumSearch(int page, int rows, string prop, string order, string wkshopcode = null, string calltypecode = null, string calldate = null, string responddate = null)
+ public HttpResponseMessage AnDonReportSumSearch(int page, int rows, string prop, string order, string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
{
string callopendate = ""; //鍛煎彨寮�濮嬫椂闂�
string callclosedate = ""; //鍛煎彨缁撴潫鏃堕棿
@@ -491,7 +492,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.AnDonReportSumSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.AnDonReportSumSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -501,13 +502,14 @@
/// 瀹夌伅鎶ヨ〃姹囨�诲鍑�
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
/// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
/// <param name="calldate">鍛煎彨鏃堕棿</param>
/// <param name="responddate">鍝嶅簲鏃堕棿</param>
/// <returns></returns>
[Route(template: "AnDonReportSumExcelSearch")]
[HttpGet]
- public HttpResponseMessage AnDonReportSumExcelSearch(string wkshopcode = null, string calltypecode = null, string calldate = null, string responddate = null)
+ public HttpResponseMessage AnDonReportSumExcelSearch(string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
{
string callopendate = ""; //鍛煎彨寮�濮嬫椂闂�
string callclosedate = ""; //鍛煎彨缁撴潫鏃堕棿
@@ -523,7 +525,7 @@
respondopendate = responddate.Split('~')[0].ToString();
respondclosedate = responddate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.AnDonReportSumExcelSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
+ mes = ReportManagerBLL.AnDonReportSumExcelSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index f27e513..85222f8 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -285,5 +285,15 @@
return BasicSettingDAL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
}
#endregion
+
+
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ public static ToMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ return BasicSettingDAL.WhkspIsEqpSearch(wkshpcode);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/ReportManagerBLL.cs b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
index 9b65ea4..72f8bbc 100644
--- a/VueWebApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
@@ -115,16 +115,16 @@
#region[瀹夌伅鎶ヨ〃姹囨�籡
- public static ToMessage AnDonReportSumSearch(string wkshopcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage AnDonReportSumSearch(string wkshopcode,string eqpcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.AnDonReportSumSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.AnDonReportSumSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
}
#endregion
#region[瀹夌伅鎶ヨ〃姹囨�诲鍑篯
- public static ToMessage AnDonReportSumExcelSearch(string wkshopcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate)
+ public static ToMessage AnDonReportSumExcelSearch(string wkshopcode,string eqpcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate)
{
- return ReportManagerDAL.AnDonReportSumExcelSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
+ return ReportManagerDAL.AnDonReportSumExcelSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
}
#endregion
}
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index b34f110..3c15a46 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -383,8 +383,8 @@
var dynamicParams = new DynamicParameters();
try
{
- //鑾峰彇褰撳墠鎵爜璁惧鏄惁鐢宠缁翠慨璁板綍
- sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
+ //鑾峰彇褰撳墠鎵爜璁惧鏄惁瀛樺湪宸茬敵璇锋垨宸茬淮淇姸鎬佹暟鎹�
+ sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
dynamicParams.Add("@eqpcode", eqpcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index ee8dc87..ecee0df 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -2084,5 +2084,33 @@
return mes;
}
#endregion
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ public static ToMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇璁惧涓嬫媺妗嗘暟鎹�
+ sql = @"select code as eqp_code,name as eqp_name
+ from TEqpInfo where wksp_code=@wkshpcode and enable='Y' ";
+ dynamicParams.Add("@wkshpcode", wkshpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ 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
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index e40351b..7167bfb 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -2438,7 +2438,7 @@
//鑾峰彇璁惧缁翠慨鏁版嵁
sql = @"select A.failure_descript,A.is_shutdown,A.repair_content,A.repair_part from TEqp_Repair A
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
- where A.repair_code='SBWX221010016'";
+ where A.repair_code=@repair_code";
dynamicParams.Add("@repair_code", repair_code);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
DeviceRepair repair = new DeviceRepair();
@@ -2449,7 +2449,7 @@
//鑾峰彇璁惧缁翠慨鍥剧墖鏁版嵁
sql = @"select M.img1url,M.img2url from TEqp_Repair A
left join TEqp_RepairImage M on A.repair_code=M.source_wo
- where A.repair_code='SBWX221010016' and M.wo_type='COMP'";
+ where A.repair_code=@repair_code and M.wo_type='COMP'";
dynamicParams.Add("@repair_code", repair_code);
var data3 = DapperHelper.selectdata(sql, dynamicParams);
repair.repairimage = data3;
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index 3769371..a9d1acb 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -1004,7 +1004,7 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and A.wkshp_code=@style ";
+ search += "and A.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (calltypecode != "" && calltypecode != null)
@@ -1049,7 +1049,7 @@
{
search = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.wkshp_code,T.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,Y.name as typename,
@@ -1058,7 +1058,7 @@
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 86400 / 3600 AS INT) AS VARCHAR) + '灏忔椂'
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 3600 / 60 AS INT) AS VARCHAR) + '鍒�'
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 60 AS INT) AS VARCHAR) + '绉�' AS respondcont,
- (case when A.resp_user is null then '寰呭搷搴�' else '浠ュ搷搴�' end) as status
+ (case when A.resp_user is null then '寰呭搷搴�' else '宸插搷搴�' end) as status
from TAnDon_Task_Info A
left join TOrganization T on A.wkshp_code=T.org_code
left join TEqpInfo E on A.eqp_code=E.code
@@ -1090,7 +1090,7 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and A.wkshp_code=@style ";
+ search += "and A.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (calltypecode != "" && calltypecode != null)
@@ -1135,7 +1135,7 @@
{
search = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.wkshp_code as 杞﹂棿缂栫爜,T.org_name as 杞﹂棿鍚嶇О,A.eqp_code as 璁惧缂栫爜,E.name as 璁惧鍚嶇О,Y.name as 鍛煎彨绫诲瀷,
@@ -1144,7 +1144,7 @@
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 86400 / 3600 AS INT) AS VARCHAR) + '灏忔椂'
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 3600 / 60 AS INT) AS VARCHAR) + '鍒�'
+ CAST(CAST(datediff(second,A.start_date,A.resp_date) % 60 AS INT) AS VARCHAR) + '绉�' AS 鍝嶅簲鏃堕暱,
- (case when A.resp_user is null then '寰呭搷搴�' else '浠ュ搷搴�' end) as 鐘舵��
+ (case when A.resp_user is null then '寰呭搷搴�' else '宸插搷搴�' end) as 鐘舵��
from TAnDon_Task_Info A
left join TOrganization T on A.wkshp_code=T.org_code
left join TEqpInfo E on A.eqp_code=E.code
@@ -1171,7 +1171,7 @@
#region[瀹夌伅鎶ヨ〃姹囨�籡
- public static ToMessage AnDonReportSumSearch(string wkshopcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage AnDonReportSumSearch(string wkshopcode,string eqpcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1179,8 +1179,13 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and A.wkshp_code=@style ";
+ search += "and A.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (eqpcode != "" && eqpcode != null)
+ {
+ search += "and A.eqp_code=@eqpcode ";
+ dynamicParams.Add("@eqpcode", eqpcode);
}
if (calltypecode != "" && calltypecode != null)
{
@@ -1204,17 +1209,18 @@
{
search = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select T.org_name as wkshp_name,Y.name as calltypename,
- (select count(*) callcount from TAnDon_Task_Info AA where AA.wkshp_code=A.wkshp_code and AA.type=A.type) as callcount,
- (select count(*) repondcount from TAnDon_Task_Info BB where BB.wkshp_code=A.wkshp_code and BB.type=A.type and BB.status='CLOSED') as repondcount,
- (select CAST(DATEDIFF(ss, start_date,resp_date)/60 as INT) from TAnDon_Task_Info CC where CC.wkshp_code=A.wkshp_code and CC.type=A.type and CC.status='CLOSED') as repondtime
- from TAnDon_Task_Info A
- left join TOrganization T on A.wkshp_code=T.org_code
- left join TAnDonType Y on A.type=Y.code
- where T.description='W' "+search+" group by A.wkshp_code,T.org_name,A.type,Y.name ";
+ var sql = @"select top 100 percent T.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,Y.name as calltypename,
+ (select count(*) callcount from TAnDon_Task_Info AA where AA.wkshp_code=A.wkshp_code and AA.type=A.type) as callcount,
+ (select count(*) repondcount from TAnDon_Task_Info BB where BB.wkshp_code=A.wkshp_code and BB.type=A.type and BB.status='CLOSED') as repondcount,
+ (select ISNULL(SUM(CAST(DATEDIFF(ss, CC.start_date,CC.resp_date)/60 as INT)),0) from TAnDon_Task_Info CC where CC.wkshp_code=A.wkshp_code and CC.eqp_code=A.eqp_code and CC.type=A.type) as repondtime
+ from TAnDon_Task_Info A
+ left join TOrganization T on A.wkshp_code=T.org_code
+ left join TAnDonType Y on A.type=Y.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ where T.description='W' " + search+" group by A.wkshp_code,T.org_name,A.type,Y.name,A.eqp_code,E.name order by T.org_name,A.eqp_code ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1233,7 +1239,7 @@
#endregion
#region[瀹夌伅鎶ヨ〃姹囨�诲鍑篯
- public static ToMessage AnDonReportSumExcelSearch(string wkshopcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate)
+ public static ToMessage AnDonReportSumExcelSearch(string wkshopcode,string eqpcode, string calltypecode, string callopendate, string callclosedate, string respondopendate, string respondclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1241,8 +1247,13 @@
{
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and A.wkshp_code=@style ";
+ search += "and A.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (eqpcode != "" && eqpcode != null)
+ {
+ search += "and A.eqp_code=@eqpcode ";
+ dynamicParams.Add("@eqpcode", eqpcode);
}
if (calltypecode != "" && calltypecode != null)
{
@@ -1266,17 +1277,18 @@
{
search = "and 1=1 ";
}
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select T.org_name as 鐢熶骇杞﹂棿,Y.name as 鍛煎彨绫诲瀷,
- (select count(*) callcount from TAnDon_Task_Info AA where AA.wkshp_code=A.wkshp_code and AA.type=A.type) as 鍛煎彨娆℃暟,
- (select count(*) repondcount from TAnDon_Task_Info BB where BB.wkshp_code=A.wkshp_code and BB.type=A.type and BB.status='CLOSED') as 鍝嶅簲娆℃暟,
- (select CAST(DATEDIFF(ss, start_date,resp_date)/60 as INT) from TAnDon_Task_Info CC where CC.wkshp_code=A.wkshp_code and CC.type=A.type and CC.status='CLOSED') as 鍝嶅簲鏃堕暱(鍒�)
- from TAnDon_Task_Info A
- left join TOrganization T on A.wkshp_code=T.org_code
- left join TAnDonType Y on A.type=Y.code
- where T.description='W' " + search + " group by A.wkshp_code,T.org_name,A.type,Y.name ";
+ var sql = @"select top 100 percent T.org_name as 鐢熶骇杞﹂棿,E.name as 璁惧鍚嶇О,Y.name as 鍛煎彨绫诲瀷,
+ (select count(*) callcount from TAnDon_Task_Info AA where AA.wkshp_code=A.wkshp_code and AA.eqp_code=A.eqp_code and AA.type=A.type) as 鎬诲懠鍙鏁�,
+ (select count(*) repondcount from TAnDon_Task_Info BB where BB.wkshp_code=A.wkshp_code and BB.eqp_code=A.eqp_code and BB.type=A.type and BB.status='CLOSED') as 鎬诲搷搴旀鏁�,
+ (select ISNULL(SUM(CAST(DATEDIFF(ss, CC.start_date,CC.resp_date)/60 as INT)),0) from TAnDon_Task_Info CC where CC.wkshp_code=A.wkshp_code and CC.eqp_code=A.eqp_code and CC.type=A.type) 鎬诲搷搴旀椂闀�
+ from TAnDon_Task_Info A
+ left join TOrganization T on A.wkshp_code=T.org_code
+ left join TAnDonType Y on A.type=Y.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ where T.description='W' " + search+" group by A.wkshp_code,T.org_name,A.type,Y.name,A.eqp_code,E.name order by T.org_name,A.eqp_code ";
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "瀹夌伅姹囨�绘姤琛�");
diff --git "a/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls" "b/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
index 04ea0ce..1699a8e 100644
--- "a/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/Logs/2022-11-03.TXT b/VueWebApi/Logs/2022-11-03.TXT
new file mode 100644
index 0000000..f055bc2
--- /dev/null
+++ b/VueWebApi/Logs/2022-11-03.TXT
@@ -0,0 +1,30 @@
+ 【时间】:2022-11-03 13:14:22,716
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 10
+ 【文件地址】:D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：“1”附近有语法错误。
+“1”附近有语法错误。
+引发异常路径：/api/ReportManager/AnDonReportDefinitSearch
+引发异常的方法：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.SqlDataReader.TryConsumeMetaData()
+ 在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+ 在 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.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+ 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Dapper.SqlMapper.ExecuteReaderWithFlagsFallback(IDbCommand cmd, Boolean wasClosed, CommandBehavior behavior)
+ 在 Dapper.SqlMapper.QueryMultipleImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.QueryMultiple(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.GetPageList[T](String sql, Object parm, String orderBy, String sort, Int32 pageIndex, Int32 pageSize, Int32& total) 位置 D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 160
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index aa591d7..c706e55 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -729,16 +729,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>11/01/2022 18:10:08</publishTime>
+ <publishTime>11/03/2022 16:32:20</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>11/01/2022 18:10:08</publishTime>
+ <publishTime>11/03/2022 16:32:20</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>11/01/2022 18:10:08</publishTime>
+ <publishTime>11/03/2022 16:32:20</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1545,7 +1545,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/01/2022 18:10:09</publishTime>
+ <publishTime>11/03/2022 16:32:27</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index dffdaa9..45eb380 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -761,53 +761,101 @@
code = "";
List<DataTable> excelTable = new List<DataTable>();
excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 2)
+ if (excelTable.Count != 4)
{
code = "300";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
return Message;
}
- else if (excelTable[0].Columns.Count != 6)
+ else if (excelTable[0].Columns.Count != 5)
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
+ }
+ else if (excelTable[1].Columns.Count != 8)
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�1鍒楀簲涓簕搴忓彿}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "鐐规椤圭洰缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�2鍒楀簲涓簕鐐规椤圭洰缂栧彿(鍞竴)}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "鐐规椤圭洰鍚嶇О")
+ else if (excelTable[0].Columns[2].ColumnName != "璁惧鐐规鏍囧噯鍚嶇О")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕鐐规椤圭洰鍚嶇О}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯鍚嶇О}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "鐐规鍛ㄦ湡")
+ else if (excelTable[0].Columns[3].ColumnName != "鐐规绠℃帶")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规鍛ㄦ湡}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐐规绠℃帶}";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
+ else if (excelTable[0].Columns[4].ColumnName != "鏍囧噯鎻忚堪")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
+ Message = "璁惧鐐规鏍囧噯椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鏍囧噯鎻忚堪}";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "鐐规椤圭洰瑕佹眰")
+ else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "璁惧鐐规椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鐐规椤圭洰瑕佹眰}";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[1].ColumnName != "鐐规椤瑰簭鍙�")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐐规椤瑰簭鍙穧";
+ return Message;
+ }
+ else if (excelTable[1].Columns[2].ColumnName != "璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[3].ColumnName != "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[4].ColumnName != "璁惧鐐规閮ㄤ綅鍚嶇О")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕璁惧鐐规閮ㄤ綅鍚嶇О}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[5].ColumnName != "鐐规閮ㄤ綅瑕佹眰")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鐐规閮ㄤ綅瑕佹眰}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[6].ColumnName != "閫夋嫨鎵爜")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閫夋嫨鎵爜}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[7].ColumnName != "鐐规鍛ㄦ湡")
+ {
+ code = "300";
+ Message = "璁惧鐐规閮ㄤ綅椤电妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鐐规鍛ㄦ湡}";
return Message;
}
else
@@ -2363,9 +2411,106 @@
StuCode = "";
count = 0;
string sql = "";
+ var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
-
+ List<DataTable> excelTable = new List<DataTable>();
+ list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
+ //褰撳墠Excel鏁版嵁涓偣妫�鏍囧噯椤电涓�,璁惧鐐规鏍囧噯缂栧彿(鍞竴鏄惁鏈夐噸澶�)
+ DataTable distinct = excelTable[0].DefaultView.ToTable(true, "璁惧鐐规鏍囧噯缂栧彿(鍞竴)");
+ if (distinct.Rows.Count != excelTable[0].Rows.Count)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}鏈夐噸澶�";
+ list.Add(erro);
+ }
+ //璁惧鐐规鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪鐐规鏍囧噯
+ for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ {
+ if (excelTable[0].Rows[j][1].ToString().Trim() != null && excelTable[0].Rows[j][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TEqpchk_Main where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[j][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规鏍囧噯琛�:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+ list.Add(erro);
+ }
+ //閫氳繃璁惧鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ璁惧鐐规閮ㄤ綅椤电妯℃澘涓搴旂殑鏁版嵁淇℃伅
+ DataTable ds = excelTable[1].AsEnumerable().Where<DataRow>(C => C["璁惧鐐规鏍囧噯缂栧彿(鍞竴)"].ToString() == excelTable[0].Rows[j][1].ToString().Trim()).CopyToDataTable();
+ if (ds.Rows.Count > 0)
+ {
+ //鍒ゆ柇鐐规鏍囧噯鏌ヨ鐐规閮ㄤ綅鏁版嵁鏄惁鏈夐噸澶�
+ DataTable distinct1 = ds.DefaultView.ToTable(true, "璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)");
+ if (distinct1.Rows.Count != ds.Rows.Count)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}:"+ excelTable[0].Rows[j][1].ToString().Trim() + " 瀵瑰簲{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}鏈夐噸澶�";
+ list.Add(erro);
+ }
+ }
+ }
+ }
+ //褰撳墠Excel鏁版嵁涓偣妫�閮ㄤ綅椤电涓�,璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)鍦ㄨ澶囩偣妫�閮ㄤ綅琛ㄤ腑鏄惁瀛樺湪
+ for (int k = 0; k < excelTable[1].Rows.Count; k++)
+ {
+ if (excelTable[1].Rows[k][3].ToString().Trim() != null && excelTable[1].Rows[k][3].ToString().Trim() != "")
+ {
+ sql = @"select * from TEqpchk_Item where code=@code";
+ dynamicParams.Add("@code", excelTable[1].Rows[k][3].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count<0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅琛�:{璁惧鐐规閮ㄤ綅缂栧彿(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ }
+ }
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ var dt3 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("璁惧鐐规鏍囧噯缂栧彿(鍞竴)")
+ ).Contains(r.Field<string>("璁惧鐐规鏍囧噯缂栧彿(鍞竴)"))
+ select r;
+ List<DataRow> listRow = dt3.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "璁惧鐐规閮ㄤ綅椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁涓湁鍊煎湪璁惧鐐规鏍囧噯椤电妯℃澘:{璁惧鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+ 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[0].Rows.Count + excelTable[1].Rows.Count;
+ }
return list;
}
#endregion
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 59da41f..4ed751e 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 d97c73f..6dc11af 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -715,7 +715,7 @@
<param name="responddate">鍝嶅簲鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
瀹夌伅鎶ヨ〃姹囨��
</summary>
@@ -724,16 +724,18 @@
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
<param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
<param name="calldate">鍛煎彨鏃堕棿</param>
<param name="responddate">鍝嶅簲鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumExcelSearch(System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumExcelSearch(System.String,System.String,System.String,System.String,System.String)">
<summary>
瀹夌伅鎶ヨ〃姹囨�诲鍑�
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
<param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
<param name="calldate">鍛煎彨鏃堕棿</param>
<param name="responddate">鍝嶅簲鏃堕棿</param>
@@ -1203,6 +1205,13 @@
<param name="ando_cogfigid">涓籭d</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.BasicSettingController.WhkspIsEqpSearch(System.String)">
+ <summary>
+ 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+ </summary>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
<summary>
璁惧绫诲瀷鏌ヨ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 59da41f..4ed751e 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 d97c73f..6dc11af 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -715,7 +715,7 @@
<param name="responddate">鍝嶅簲鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
瀹夌伅鎶ヨ〃姹囨��
</summary>
@@ -724,16 +724,18 @@
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
<param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
<param name="calldate">鍛煎彨鏃堕棿</param>
<param name="responddate">鍝嶅簲鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumExcelSearch(System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.AnDonReportSumExcelSearch(System.String,System.String,System.String,System.String,System.String)">
<summary>
瀹夌伅鎶ヨ〃姹囨�诲鍑�
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
<param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
<param name="calldate">鍛煎彨鏃堕棿</param>
<param name="responddate">鍝嶅簲鏃堕棿</param>
@@ -1203,6 +1205,13 @@
<param name="ando_cogfigid">涓籭d</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.BasicSettingController.WhkspIsEqpSearch(System.String)">
+ <summary>
+ 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+ </summary>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
<summary>
璁惧绫诲瀷鏌ヨ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index b921405..a11adf0 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -564,6 +564,7 @@
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 59da41f..4ed751e 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3