From b7041949338728f4f8b7cc96f4ed6a92b40fda36 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 05 一月 2024 12:30:56 +0800
Subject: [PATCH] 1.Startup.cs 文件中增加授权.apk文件 2.Excel下载方法中增加.net core直接下载wwwroot下的文件代码(暂时不用，先注释掉)
---
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 929 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 676 insertions(+), 253 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 148d517..de5c511 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -68,7 +68,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
+ var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,A.location_code,L.name as location_name,
A.surp_life,(select isnull(sum(usecount_life),0) from TMould_UpDownReord R where R.mould_code=A.code) as serlife,
A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
STUFF((SELECT ',' + B.partcode
@@ -78,6 +78,7 @@
A.lm_user as usercode,U.username,A.lm_date
from TMouldInfo A
left join TSecStck S on A.warehousecode=S.code
+ left join TSecLoca L on A.location_code=L.code
left join (
select distinct mouldcode from TMouldInfoPart
) M on A.code=M.mouldcode
@@ -85,7 +86,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -93,7 +94,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -153,14 +154,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -219,14 +220,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -235,7 +236,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -249,6 +250,7 @@
string search = "";
try
{
+ dynamicParams.Add("@mouldcode", mouldcode);
if (opendate != "" && opendate != null)
{
search += "and AA.operdate between @opendate and @closedate ";
@@ -257,47 +259,49 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select * from (
+ var sql = @"select top 100 percent AA.*,U.username as operusername from (
select '鐐规' as opertype,chk_user as operuser,chk_date as operdate,chk_result as operresult
- from TMouldchk_Proc_Main where mould_code='001'
+ from TMouldchk_Proc_Main where mould_code=@mouldcode
union all
select '淇濆吇' as opertype,maint_user as operuser,maint_date as operdate,maint_result as operresult
- from TMouldmaint_Proc_Main where mould_code='001'
+ from TMouldmaint_Proc_Main where mould_code=@mouldcode
union all
select '寰呯淮淇�' as opertype,request_person as operuser,request_date as operdate,'缁翠慨鐢宠' as operresult
- from TMould_RepairRequest where mould_code='001'
+ from TMould_RepairRequest where mould_code=@mouldcode
union all
select '宸茬淮淇�' as opertype,repair_person as operuser,repair_date as operdate,'缁翠慨瀹屾垚' as operresult
from TMould_RepairRequest A
inner join TMould_Repair B on A.docu_code=B.source_wo
- where A.mould_code='001' and B.repair_person<>''
+ where A.mould_code=@mouldcode and B.repair_person<>''
union all
select '宸查獙璇�' as opertype,verify_person as operuser,verify_date as operdate,B.verify_result as operresult
from TMould_RepairRequest A
inner join TMould_Repair B on A.docu_code=B.source_wo
- where A.mould_code='001' and B.verify_person<>''
+ where A.mould_code=@mouldcode and B.verify_person<>''
union all
select '宸蹭笂鏈�' as opertype,lm_user as operuser,lm_date as operdate,eqp_code as operresult
- from TMould_UpDownReord where mould_code='001' and type='UP'
+ from TMould_UpDownReord where mould_code=@mouldcode and type='UP'
union all
select '宸蹭笅鏈�' as opertype,lm_user as operuser,lm_date as operdate,eqp_code as operresult
- from TMould_UpDownReord where mould_code='001' and type='DOWN'
+ from TMould_UpDownReord where mould_code=@mouldcode and type='DOWN'
union all
select '宸插叆搴�' as opertype,lm_user as operuser,lm_date as operdate,warehouse_code as operresult
- from TMould_InOutReord where mould_code='001' and type='IN'
+ from TMould_InOutReord where mould_code=@mouldcode and type='IN'
union all
select '宸插嚭搴�' as opertype,lm_user as operuser,lm_date as operdate,warehouse_code as operresult
- from TMould_InOutReord where mould_code='001' and type='OUT'
+ from TMould_InOutReord where mould_code=@mouldcode and type='OUT'
union all
select '宸插鍊�' as opertype,lm_user as operuser,lm_date as operdate,description as operresult
- from TMould_LendOutReord where mould_code='001' and type='OUT'
+ from TMould_LendOutReord where mould_code=@mouldcode and type='OUT'
union all
select '宸插綊杩�' as opertype,lm_user as operuser,lm_date as operdate,description as operresult
- from TMould_LendOutReord where mould_code='001' and type='IN'
- ) as AA where 1=1 "+search+" order by AA.operdate desc ";
+ from TMould_LendOutReord where mould_code=@mouldcode and type='IN'
+ ) as AA
+ left join TUser U on AA.operuser=U.usercode
+ where 1=1 " + search+" order by AA.operdate desc ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -305,7 +309,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -339,7 +343,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -363,14 +367,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -379,7 +383,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -422,7 +426,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -430,7 +434,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -459,14 +463,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -487,14 +491,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -503,7 +507,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -528,7 +532,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -543,14 +547,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -559,7 +563,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -602,7 +606,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -610,7 +614,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -641,7 +645,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -654,14 +658,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -708,14 +712,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -755,14 +759,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -771,7 +775,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -793,7 +797,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -813,14 +817,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -828,7 +832,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -861,13 +865,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏃犳ā鍏疯祫鏂�!";
+ mes.message = "鏃犳ā鍏疯祫鏂�!";
mes.data = null;
}
}
@@ -875,7 +879,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -931,14 +935,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规鏍囧噯鍏宠仈妯″叿", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -946,7 +950,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -989,7 +993,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -997,7 +1001,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1026,14 +1030,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1054,14 +1058,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1070,7 +1074,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1095,7 +1099,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1110,14 +1114,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -1126,7 +1130,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1169,7 +1173,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1177,7 +1181,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1208,7 +1212,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -1221,14 +1225,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1275,14 +1279,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1322,14 +1326,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1338,7 +1342,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1360,7 +1364,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1380,14 +1384,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -1395,7 +1399,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1428,13 +1432,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏃犳ā鍏疯祫鏂�!";
+ mes.message = "鏃犳ā鍏疯祫鏂�!";
mes.data = null;
}
}
@@ -1442,7 +1446,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1498,14 +1502,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1513,7 +1517,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1537,13 +1541,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -1551,7 +1555,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1574,13 +1578,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
+ mes.message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
mes.data = data;
}
}
@@ -1588,7 +1592,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1615,13 +1619,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
+ mes.message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
mes.data = data;
}
}
@@ -1629,7 +1633,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1660,7 +1664,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1710,14 +1714,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规", "妯″叿:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鐐规鎴愬姛!";
+ mes.message = "鐐规鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规澶辫触!";
+ mes.message = "鐐规澶辫触!";
mes.data = null;
}
}
@@ -1725,7 +1729,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1749,13 +1753,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -1763,7 +1767,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1786,13 +1790,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
+ mes.message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
mes.data = data;
}
}
@@ -1800,7 +1804,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1827,13 +1831,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
+ mes.message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
mes.data = data;
}
}
@@ -1841,7 +1845,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1872,7 +1876,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1922,14 +1926,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇", "妯″叿:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇濆吇鎴愬姛!";
+ mes.message = "淇濆吇鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇澶辫触!";
+ mes.message = "淇濆吇澶辫触!";
mes.data = null;
}
}
@@ -1937,7 +1941,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1965,14 +1969,14 @@
if (dt.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+ mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
mes.data = null;
return mes;
}
@@ -1982,7 +1986,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2051,14 +2055,14 @@
}
list.Add(moud);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+ mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
mes.data = null;
return mes;
}
@@ -2067,7 +2071,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2092,17 +2096,17 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
mes.data = null;
return mes;
default:
@@ -2112,7 +2116,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2128,13 +2132,13 @@
if (rows.Length > 0)
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
+ mes.message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
mes.data = null;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
+ mes.message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
mes.data = null;
}
}
@@ -2149,13 +2153,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -2164,7 +2168,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2258,14 +2262,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨鐢宠", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠鎴愬姛!";
+ mes.message = "缁翠慨鐢宠鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠澶辫触!";
+ mes.message = "缁翠慨鐢宠澶辫触!";
mes.data = null;
}
}
@@ -2273,7 +2277,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2306,13 +2310,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨鐢宠璁板綍!";
+ mes.message = "鏆傛棤缁翠慨鐢宠璁板綍!";
mes.data = data;
}
}
@@ -2320,7 +2324,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2418,14 +2422,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨鎴愬姛!";
+ mes.message = "缁翠慨鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨澶辫触!";
+ mes.message = "缁翠慨澶辫触!";
mes.data = null;
}
}
@@ -2433,7 +2437,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2465,13 +2469,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨璁板綍!";
+ mes.message = "鏆傛棤缁翠慨璁板綍!";
mes.data = data;
}
}
@@ -2479,7 +2483,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2515,13 +2519,13 @@
}
dict.Add("repair_content", data.Rows[0]["repair_content"].ToString()); //缁翠慨鍐呭
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dict;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨璁板綍!";
+ mes.message = "鏆傛棤缁翠慨璁板綍!";
mes.data = null;
}
}
@@ -2529,7 +2533,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2604,14 +2608,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨楠岃瘉", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨楠岃瘉鎴愬姛!";
+ mes.message = "缁翠慨楠岃瘉鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨楠岃瘉澶辫触!";
+ mes.message = "缁翠慨楠岃瘉澶辫触!";
mes.data = null;
}
}
@@ -2619,7 +2623,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2648,22 +2652,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -2671,7 +2675,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
mes.data = null;
return mes;
}
@@ -2679,7 +2683,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2689,7 +2693,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2709,14 +2713,14 @@
)";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2759,14 +2763,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿涓婃満", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿涓婃満鎴愬姛!";
+ mes.message = "妯″叿涓婃満鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿涓婃満澶辫触!";
+ mes.message = "妯″叿涓婃満澶辫触!";
mes.data = null;
}
}
@@ -2774,7 +2778,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2810,14 +2814,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2825,7 +2829,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2833,7 +2837,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2843,7 +2847,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2901,14 +2905,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿涓嬫満", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿涓嬫満鎴愬姛!";
+ mes.message = "妯″叿涓嬫満鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿涓嬫満澶辫触!";
+ mes.message = "妯″叿涓嬫満澶辫触!";
mes.data = null;
}
}
@@ -2916,7 +2920,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2945,22 +2949,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -2968,7 +2972,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
mes.data = null;
return mes;
}
@@ -2976,7 +2980,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2986,7 +2990,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3029,14 +3033,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿澶栧��", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿澶栧�熸垚鍔�!";
+ mes.message = "妯″叿澶栧�熸垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿澶栧�熷け璐�!";
+ mes.message = "妯″叿澶栧�熷け璐�!";
mes.data = null;
}
}
@@ -3044,7 +3048,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3079,14 +3083,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3094,7 +3098,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3102,7 +3106,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3112,7 +3116,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3159,14 +3163,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿褰掕繕", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿褰掕繕鎴愬姛!";
+ mes.message = "妯″叿褰掕繕鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿褰掕繕澶辫触!";
+ mes.message = "妯″叿褰掕繕澶辫触!";
mes.data = null;
}
}
@@ -3174,7 +3178,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3203,22 +3207,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -3226,7 +3230,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3234,7 +3238,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3244,7 +3248,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3252,7 +3256,7 @@
#endregion
#region[妯″叿鍏ュ簱鎻愪氦]
- public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -3261,8 +3265,8 @@
{
list.Clear();
//鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍏ュ簱鎿嶄綔)
- sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
- values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -3271,6 +3275,7 @@
mould_code = mouldcode,
type = "IN",
warehouse_code = warehousecode,
+ location_code = locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3278,8 +3283,8 @@
});
//鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍏ュ簱),浠撳簱缂栫爜
- sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode where code=@mouldcode";
- list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });
+ sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode,location_code=@location_code where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode, location_code = locationcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -3288,14 +3293,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鍏ュ簱", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿鍏ュ簱鎴愬姛!";
+ mes.message = "妯″叿鍏ュ簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿鍏ュ簱澶辫触!";
+ mes.message = "妯″叿鍏ュ簱澶辫触!";
mes.data = null;
}
}
@@ -3303,7 +3308,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3329,23 +3334,24 @@
{
//鍒ゆ柇褰撳墠妯″叿鏄惁鍦ㄥ鍊熺姸鎬�
sql = @"select M.code as mould_code,M.name as mould_name,M.spec as mould_spec,
- M.surp_life,M.resi_life,M.warehousecode,C.name as warehousename
+ M.surp_life,M.resi_life,M.warehousecode,C.name as warehousename,M.location_code,L.name as location_name
from TMouldInfo M
left join TSecStck C on M.warehousecode=C.code
+ left join TSecLoca L on M.location_code=L.code
where M.code=@mouldcode and M.usestatus='0'";
dynamicParams.Add("@mouldcode", mouldcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3353,7 +3359,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3361,7 +3367,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3371,7 +3377,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3379,7 +3385,7 @@
#endregion
#region[妯″叿鍑哄簱鎻愪氦]
- public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -3388,8 +3394,8 @@
{
list.Clear();
//鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍑哄簱鎿嶄綔)
- sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
- values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -3398,6 +3404,7 @@
mould_code = mouldcode,
type = "OUT",
warehouse_code = warehousecode,
+ location_code= locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3405,8 +3412,8 @@
});
//鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍑哄簱),娓呴櫎浠撳簱缂栫爜
- sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode where code=@mouldcode";
- list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });
+ sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode,location_code=@location_code where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="", location_code="" } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -3415,14 +3422,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鍑哄簱", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿鍑哄簱鎴愬姛!";
+ mes.message = "妯″叿鍑哄簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿鍑哄簱澶辫触!";
+ mes.message = "妯″叿鍑哄簱澶辫触!";
mes.data = null;
}
}
@@ -3430,7 +3437,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3497,7 +3504,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3505,7 +3512,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3527,14 +3534,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3631,7 +3638,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿鐐规璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3639,7 +3646,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3695,14 +3702,9 @@
search += "and A.maint_result=@repairresult ";
dynamicParams.Add("@repairresult", repairresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
+ var sql = @"select A.id,A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
U.username as maint_user,A.maint_result,A.maint_date
from TMouldmaint_Proc_Main A
left join TMouldInfo E on A.mould_code=E.code
@@ -3711,7 +3713,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3719,7 +3721,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3741,14 +3743,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3803,10 +3805,6 @@
search += "and A.maint_result=@repairresult ";
dynamicParams.Add("@repairresult", repairresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -3850,7 +3848,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿淇濆吇璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3858,7 +3856,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3921,11 +3919,6 @@
dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
}
-
- if (search == "")
- {
- search = "and 1=1 ";
- }
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -3941,7 +3934,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3949,7 +3942,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4011,14 +4004,14 @@
repair.repairimage = data3;
Dict.Add("data2", repair);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = Dict;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4080,11 +4073,6 @@
dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
}
-
- if (search == "")
- {
- search = "and 1=1 ";
- }
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -4103,7 +4091,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿缁翠慨璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4111,7 +4099,442 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿涓婁笅鏈鸿褰曟煡璇
+ public static ToMessage MouldUpDownMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (devicecode != "" && devicecode != null)
+ {
+ search += "and A.eqp_code=@devicecode ";
+ dynamicParams.Add("@devicecode", devicecode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as type,A.usecount_life,
+ A.eqp_code,E.name as eqp_name,U.username as lm_user,A.lm_date
+ from TMould_UpDownReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿涓婁笅鏈鸿瀵煎嚭Excel]
+ public static ToMessage MouldUpDownMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (devicecode != "" && devicecode != null)
+ {
+ search += "and A.eqp_code=@devicecode ";
+ dynamicParams.Add("@devicecode", devicecode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '妯″叿瑙勬牸',
+ (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as '鎿嶄綔绫诲瀷',A.usecount_life as '鏈浣跨敤',
+ A.eqp_code as '璁惧缂栫爜',E.name as '璁惧鍚嶇О',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'
+ from TMould_UpDownReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿涓婁笅鏈鸿褰曟姤琛�");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鍊熻繕璁板綍鏌ヨ]
+ public static ToMessage MouldCirculateMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as type,
+ A.description,U.username as lm_user,A.lm_date
+ from TMould_LendOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍊熻繕璁板綍瀵煎嚭]
+ public static ToMessage MouldCirculateMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '瑙勬牸鍨嬪彿',
+ (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as '鎿嶄綔绫诲瀷',
+ A.description as '鎻忚堪',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'
+ from TMould_LendOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿鍊熻繕璁板綍鎶ヨ〃");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄叆搴撹褰曟煡璇
+ public static ToMessage MouldInOutMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (warehousecode != "" && warehousecode != null)
+ {
+ search += "and A.warehouse_code=@warehousecode ";
+ dynamicParams.Add("@warehousecode", warehousecode);
+ }
+ if (locationcode != "" && locationcode != null)
+ {
+ search += "and A.location_code=@locationcode ";
+ dynamicParams.Add("@locationcode", locationcode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,A.warehouse_code,S.name as warehouse_name,
+ A.location_code,L.name as location_name,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as type,
+ A.description,U.username as lm_user,A.lm_date
+ from TMould_InOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TSecStck S on A.warehouse_code=S.code
+ left join TSecLoca L on A.location_code=L.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+ public static ToMessage MouldInOutMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (warehousecode != "" && warehousecode != null)
+ {
+ search += "and A.warehouse_code=@warehousecode ";
+ dynamicParams.Add("@warehousecode", warehousecode);
+ }
+ if (locationcode != "" && locationcode != null)
+ {
+ search += "and A.location_code=@locationcode ";
+ dynamicParams.Add("@locationcode", locationcode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as 妯″叿缂栫爜,M.name as 妯″叿鍚嶇О,M.spec as 瑙勬牸鍨嬪彿,A.warehouse_code as 浠撳簱缂栫爜,S.name as 浠撳簱鍚嶇О,
+ A.location_code as 搴撲綅缂栫爜,L.name as 搴撲綅鍚嶇О,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as 鎿嶄綔绫诲瀷,
+ A.description as 鎻忚堪,U.username as 鎿嶄綔浜�,A.lm_date as 鎿嶄綔鏃堕棿
+ from TMould_InOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TSecStck S on A.warehouse_code=S.code
+ left join TSecLoca L on A.location_code=L.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿鍑哄叆搴撹褰曟姤琛�");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
--
Gitblit v1.9.3