From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 630 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 397 insertions(+), 233 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 7d86f8e..769a0b6 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -86,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();
}
@@ -94,7 +94,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -102,7 +102,7 @@
#endregion
#region[妯″叿娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec,string warehousecode,string location_code, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -112,8 +112,8 @@
if (opertype == "Add")
{
//鍐欏叆妯″叿娓呭崟琛�
- sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
- values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date,warehousecode,location_code)
+ values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date,@warehousecode,@location_code)";
list.Add(new
{
str = sql,
@@ -125,6 +125,8 @@
status = status,
surp_life = surplife,
resi_life = resilife,
+ warehousecode=warehousecode,
+ location_code=location_code,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -154,14 +156,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;
}
}
@@ -169,7 +171,7 @@
{
//淇敼妯″叿娓呭崟琛�
sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,
- surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
+ surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date,warehousecode=@warehousecode,location_code=@location_code where code=@code";
list.Add(new
{
str = sql,
@@ -181,6 +183,8 @@
status = status,
surp_life = surplife,
resi_life = resilife,
+ warehousecode = warehousecode,
+ location_code = location_code,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -220,14 +224,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;
}
}
@@ -236,7 +240,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -250,6 +254,7 @@
string search = "";
try
{
+ dynamicParams.Add("@mouldcode", mouldcode);
if (opendate != "" && opendate != null)
{
search += "and AA.operdate between @opendate and @closedate ";
@@ -258,47 +263,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();
}
@@ -306,7 +313,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -340,7 +347,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -364,14 +371,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;
}
@@ -380,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -423,7 +430,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();
}
@@ -431,7 +438,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -460,14 +467,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;
}
}
@@ -488,14 +495,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;
}
}
@@ -504,7 +511,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -529,7 +536,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -544,14 +551,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;
}
@@ -560,7 +567,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -603,7 +610,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();
}
@@ -611,7 +618,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -642,7 +649,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -655,14 +662,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;
@@ -709,14 +716,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;
}
}
@@ -756,14 +763,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;
}
}
@@ -772,7 +779,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -794,7 +801,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -814,14 +821,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;
}
}
@@ -829,7 +836,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -862,13 +869,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;
}
}
@@ -876,7 +883,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -932,14 +939,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;
}
}
@@ -947,7 +954,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -990,7 +997,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();
}
@@ -998,7 +1005,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1027,14 +1034,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;
}
}
@@ -1055,14 +1062,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;
}
}
@@ -1071,7 +1078,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1096,7 +1103,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1111,14 +1118,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;
}
@@ -1127,7 +1134,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1170,7 +1177,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();
}
@@ -1178,7 +1185,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1209,7 +1216,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -1222,14 +1229,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;
@@ -1276,14 +1283,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;
}
}
@@ -1323,14 +1330,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;
}
}
@@ -1339,7 +1346,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1361,7 +1368,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1381,14 +1388,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;
}
}
@@ -1396,7 +1403,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1429,13 +1436,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;
}
}
@@ -1443,7 +1450,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1499,14 +1506,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;
}
}
@@ -1514,7 +1521,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1538,13 +1545,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;
}
}
@@ -1552,7 +1559,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1575,13 +1582,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;
}
}
@@ -1589,7 +1596,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1616,13 +1623,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;
}
}
@@ -1630,7 +1637,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1661,7 +1668,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1711,14 +1718,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;
}
}
@@ -1726,7 +1733,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1750,13 +1757,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;
}
}
@@ -1764,7 +1771,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1787,13 +1794,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;
}
}
@@ -1801,7 +1808,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1828,13 +1835,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;
}
}
@@ -1842,7 +1849,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1873,7 +1880,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1923,14 +1930,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;
}
}
@@ -1938,7 +1945,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1966,14 +1973,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;
}
@@ -1983,7 +1990,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2052,14 +2059,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;
}
@@ -2068,7 +2075,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2093,17 +2100,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:
@@ -2113,7 +2120,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2129,13 +2136,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;
}
}
@@ -2150,13 +2157,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;
}
}
@@ -2165,7 +2172,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2259,14 +2266,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;
}
}
@@ -2274,7 +2281,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2307,13 +2314,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;
}
}
@@ -2321,7 +2328,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2419,14 +2426,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;
}
}
@@ -2434,7 +2441,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2466,13 +2473,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;
}
}
@@ -2480,7 +2487,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2516,13 +2523,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;
}
}
@@ -2530,7 +2537,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2605,14 +2612,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;
}
}
@@ -2620,7 +2627,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2649,22 +2656,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;
}
@@ -2672,7 +2679,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
mes.data = null;
return mes;
}
@@ -2680,7 +2687,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2690,7 +2697,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2710,14 +2717,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;
@@ -2760,14 +2767,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;
}
}
@@ -2775,7 +2782,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2811,14 +2818,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;
}
@@ -2826,7 +2833,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2834,7 +2841,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2844,7 +2851,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2902,14 +2909,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;
}
}
@@ -2917,7 +2924,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2946,22 +2953,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;
}
@@ -2969,7 +2976,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
mes.data = null;
return mes;
}
@@ -2977,7 +2984,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2987,7 +2994,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3030,14 +3037,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;
}
}
@@ -3045,7 +3052,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3080,14 +3087,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;
}
@@ -3095,7 +3102,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3103,7 +3110,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3113,7 +3120,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3160,14 +3167,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;
}
}
@@ -3175,7 +3182,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3204,22 +3211,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;
}
@@ -3227,7 +3234,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3235,7 +3242,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3245,7 +3252,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3290,14 +3297,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;
}
}
@@ -3305,7 +3312,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3341,14 +3348,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;
}
@@ -3356,7 +3363,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3364,7 +3371,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3374,7 +3381,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3419,14 +3426,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;
}
}
@@ -3434,7 +3441,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3501,7 +3508,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();
}
@@ -3509,7 +3516,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3531,14 +3538,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;
@@ -3635,7 +3642,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿鐐规璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3643,7 +3650,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3710,7 +3717,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();
}
@@ -3718,7 +3725,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3740,14 +3747,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;
@@ -3845,7 +3852,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿淇濆吇璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3853,7 +3860,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3931,7 +3938,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();
}
@@ -3939,7 +3946,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4001,14 +4008,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;
@@ -4088,7 +4095,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿缁翠慨璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4096,7 +4103,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4160,7 +4167,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();
}
@@ -4168,7 +4175,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4233,7 +4240,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿涓婁笅鏈鸿褰曟姤琛�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4241,7 +4248,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4299,7 +4306,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();
}
@@ -4307,7 +4314,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4366,7 +4373,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿鍊熻繕璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4374,7 +4381,164 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ 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