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 | 1630 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 1,416 insertions(+), 214 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index a7085be..769a0b6 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -66,13 +66,9 @@
dynamicParams.Add("@opendate", opendate + " 00:00:00");
dynamicParams.Add("@closedate", closedate + " 23:59:59");
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
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
@@ -82,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
@@ -89,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();
}
@@ -97,7 +94,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -105,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();
@@ -115,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,
@@ -128,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()
}
@@ -157,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;
}
}
@@ -172,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,
@@ -184,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()
}
@@ -223,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;
}
}
@@ -239,7 +240,80 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鏌ョ湅灞ュ巻]
+ public static ToMessage MoldResumeSearch(string mouldcode, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ dynamicParams.Add("@mouldcode", mouldcode);
+ if (opendate != "" && opendate != null)
+ {
+ search += "and AA.operdate between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ 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=@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=@mouldcode
+ union all
+ select '寰呯淮淇�' as opertype,request_person as operuser,request_date as operdate,'缁翠慨鐢宠' as operresult
+ 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=@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=@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=@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=@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=@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=@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=@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=@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.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -273,7 +347,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -297,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;
}
@@ -313,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -356,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();
}
@@ -364,7 +438,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -393,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;
}
}
@@ -421,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;
}
}
@@ -437,7 +511,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -462,7 +536,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -477,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;
}
@@ -493,7 +567,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -536,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();
}
@@ -544,7 +618,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -575,7 +649,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -588,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;
@@ -642,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;
}
}
@@ -689,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;
}
}
@@ -705,7 +779,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -727,7 +801,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -747,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;
}
}
@@ -762,7 +836,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -795,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;
}
}
@@ -809,7 +883,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -865,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;
}
}
@@ -880,7 +954,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -923,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();
}
@@ -931,7 +1005,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -960,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;
}
}
@@ -988,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;
}
}
@@ -1004,7 +1078,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1029,7 +1103,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1044,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;
}
@@ -1060,7 +1134,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1103,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();
}
@@ -1111,7 +1185,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1142,7 +1216,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -1155,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;
@@ -1209,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;
}
}
@@ -1256,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;
}
}
@@ -1272,7 +1346,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1294,7 +1368,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1314,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;
}
}
@@ -1329,7 +1403,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1362,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;
}
}
@@ -1376,7 +1450,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1432,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;
}
}
@@ -1447,7 +1521,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1471,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;
}
}
@@ -1485,7 +1559,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1508,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;
}
}
@@ -1522,7 +1596,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1549,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;
}
}
@@ -1563,7 +1637,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1594,7 +1668,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1644,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;
}
}
@@ -1659,7 +1733,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1683,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;
}
}
@@ -1697,7 +1771,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1720,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;
}
}
@@ -1734,7 +1808,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1761,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;
}
}
@@ -1775,7 +1849,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1806,7 +1880,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1856,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;
}
}
@@ -1871,7 +1945,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1899,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;
}
@@ -1916,7 +1990,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1985,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;
}
@@ -2001,7 +2075,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2026,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:
@@ -2046,7 +2120,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2062,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;
}
}
@@ -2083,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;
}
}
@@ -2098,7 +2172,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2132,7 +2206,8 @@
{
IFormFile file = files[i];
string imgName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
- string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕(瀛樻枃浠跺湴鍧�)
+ string filePath1 = "MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕(瀛樻暟鎹〃鍦板潃)
// 鐢熸垚鏂囦欢鍚�
//var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
@@ -2155,7 +2230,7 @@
{
source_wo = sqwo,
wo_type = "REPA",
- img1url = filePath
+ img1url = filePath1
}
});
}
@@ -2191,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;
}
}
@@ -2206,7 +2281,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2239,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;
}
}
@@ -2253,7 +2328,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2287,8 +2362,8 @@
{
IFormFile file = files[i];
string imgName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
- string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
-
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕(瀛樻枃浠跺湴鍧�)
+ string filePath1 = "MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕(瀛樻暟鎹〃鍦板潃)
// 鐢熸垚鏂囦欢鍚�
//var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
@@ -2310,7 +2385,7 @@
{
source_wo = wxwo,
wo_type = "COMP",
- img1url = filePath
+ img1url = filePath1
}
});
}
@@ -2351,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;
}
}
@@ -2366,7 +2441,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2381,7 +2456,7 @@
var dynamicParams = new DynamicParameters();
try
{
- if (mouldcode == "" || mouldcode == null)
+ if (mouldcode != "" && mouldcode != null)
{
search += "and B.code=@mouldcode ";
dynamicParams.Add("@mouldcode", mouldcode);
@@ -2398,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;
}
}
@@ -2412,7 +2487,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2430,7 +2505,7 @@
//鏍规嵁璁炬ā鍏风紪鐮佽幏鍙栫淮淇鎯�
sql = @"select repair_code,failure_descript,is_shutdown,repair_content,repair_part
from TMould_Repair
- where repair_code=@repair_code and mould_code=mouldcode";
+ where repair_code=@repair_code and mould_code=@mouldcode";
dynamicParams.Add("@repair_code", repair_code);
dynamicParams.Add("@mouldcode", mouldcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2448,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;
}
}
@@ -2462,7 +2537,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2537,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;
}
}
@@ -2552,7 +2627,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2581,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;
}
@@ -2604,7 +2679,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
mes.data = null;
return mes;
}
@@ -2612,7 +2687,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2622,7 +2697,34 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿涓婃満,閫夋嫨鏈笂妯¤澶嘳
+ public static ToMessage MouldEqpPermissions()
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select code,name from TEqpInfo where enable='Y' and code not in
+ (
+ select distinct eqp_code from TMould_UpDownReord where is_up='Y'
+ )";
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2665,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;
}
}
@@ -2680,7 +2782,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2716,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;
}
@@ -2731,7 +2833,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2739,7 +2841,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2749,7 +2851,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2767,7 +2869,7 @@
list.Clear();
//鍐欏叆涓婁笅鏈烘満璁板綍琛�(涓嬫満鎿嶄綔)
sql = @"insert into TMould_UpDownReord(mould_code,type,usecount_life,eqp_code,description,is_up,lm_user,lm_date)
- values(@mould_code,@type,@eqp_code,@description,@is_up,@lm_user,@lm_date)";
+ values(@mould_code,@type,@usecount_life,@eqp_code,@description,@is_up,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -2807,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;
}
}
@@ -2822,7 +2924,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2851,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;
}
@@ -2874,7 +2976,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
mes.data = null;
return mes;
}
@@ -2882,7 +2984,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2892,7 +2994,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2935,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;
}
}
@@ -2950,7 +3052,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2985,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;
}
@@ -3000,7 +3102,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3008,7 +3110,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3018,7 +3120,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3065,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;
}
}
@@ -3080,7 +3182,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3109,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;
}
@@ -3132,7 +3234,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3140,7 +3242,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3150,7 +3252,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3158,7 +3260,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>();
@@ -3167,8 +3269,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,
@@ -3177,6 +3279,7 @@
mould_code = mouldcode,
type = "IN",
warehouse_code = warehousecode,
+ location_code = locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3184,8 +3287,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)
@@ -3194,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;
}
}
@@ -3209,7 +3312,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3235,23 +3338,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;
}
@@ -3259,7 +3363,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3267,7 +3371,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3277,7 +3381,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3285,7 +3389,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>();
@@ -3294,8 +3398,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,
@@ -3304,6 +3408,7 @@
mould_code = mouldcode,
type = "OUT",
warehouse_code = warehousecode,
+ location_code= locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3311,8 +3416,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)
@@ -3321,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;
}
}
@@ -3336,7 +3441,1104 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鐐规璁板綍鏌ヨ]
+ public static ToMessage MouldCheckTakeSearch(string mouldcode, string mouldname, string mouldspec, string stanedcode, string stanedname, string checkuser, string checkopendate, string checkclosedate,string checkrequest, 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (stanedcode != "" && stanedcode != null)
+ {
+ search += "and M.code like '%'+@stanedcode+'%' ";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ }
+ if (stanedname != "" && stanedname != null)
+ {
+ search += "and M.name like '%'+@stanedname+'%' ";
+ dynamicParams.Add("@stanedname", stanedname);
+ }
+ if (checkuser != "" && checkuser != null)
+ {
+ search += "and U.username like '%'+@checkuser+'%' ";
+ dynamicParams.Add("@checkuser", checkuser);
+ }
+ if (checkrequest != "" && checkrequest != null)
+ {
+ search += "and A.chk_result=@checkrequest ";
+ dynamicParams.Add("@checkrequest", checkrequest);
+ }
+ if (checkopendate != "" && checkopendate != null)
+ {
+ search += "and A.chk_date between @checkopendate and @checkclosedate ";
+ dynamicParams.Add("@checkopendate", checkopendate + " 00:00:00");
+ dynamicParams.Add("@checkclosedate", checkclosedate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.djwo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
+ U.username as chk_user,A.chk_result,A.chk_date
+ from TMouldchk_Proc_Main A
+ left join TMouldInfo E on A.mould_code=E.code
+ left join TMouldchk_Main M on A.mouldchkmain_code=M.code
+ left join TUser U on A.chk_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 MouldCheckSubTakeSearch(string id)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select A.seq,T.code as itemcode,T.name as itemname,A.result,A.chk_value,A.remark
+ from TMouldchk_Proc_Deta A
+ left join TMouldchk_Item T on A.mouldchkdeta_code=T.code
+ where A.m_id=@id";
+ dynamicParams.Add("@id", id);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鐐规璁板綍瀵煎嚭]
+ public static ToMessage MouldCheckTakeOutExcel(string mouldcode, string mouldname, string mouldspec, string stanedcode, string stanedname, string checkuser, string checkopendate, string checkclosedate,string checkrequest)
+ {
+ 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (stanedcode != "" && stanedcode != null)
+ {
+ search += "and M.code like '%'+@stanedcode+'%' ";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ }
+ if (stanedname != "" && stanedname != null)
+ {
+ search += "and M.name like '%'+@stanedname+'%' ";
+ dynamicParams.Add("@stanedname", stanedname);
+ }
+ if (checkuser != "" && checkuser != null)
+ {
+ search += "and U.username like '%'+@checkuser+'%' ";
+ dynamicParams.Add("@checkuser", checkuser);
+ }
+ if (checkrequest != "" && checkrequest != null)
+ {
+ search += "and A.chk_result=@checkrequest ";
+ dynamicParams.Add("@checkrequest", checkrequest);
+ }
+ if (checkopendate != "" && checkopendate != null)
+ {
+ search += "and A.chk_date between @checkopendate and @checkclosedate ";
+ dynamicParams.Add("@checkopendate", checkopendate + " 00:00:00");
+ dynamicParams.Add("@checkclosedate", checkclosedate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN A.djwo
+ ELSE ''END AS '鐐规鍗曞彿',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN A.mould_code
+ ELSE ''END AS '妯″叿缂栧彿',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN E.name
+ ELSE ''END AS '妯″叿鍚嶇О',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN E.spec
+ ELSE ''END AS '瑙勬牸鍨嬪彿',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN A.mouldchkmain_code
+ ELSE ''END AS '鐐规鏍囧噯缂栫爜',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN M.name
+ ELSE ''END AS '鐐规鏍囧噯鍚嶇О',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN U.username
+ ELSE ''END AS '妫�楠屼汉鍛�',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN A.chk_result
+ ELSE ''END AS '妫�楠岀粨鏋�',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.djwo ORDER BY B.mouldchkdeta_code) = 1 THEN A.chk_date
+ END AS '妫�楠屾椂闂�',
+ B.seq as '鐐规閮ㄤ綅搴忓彿',H.code '鐐规閮ㄤ綅缂栫爜',H.name '鐐规閮ㄤ綅鍚嶇О',B.result '鐐规缁撴灉',B.chk_value '鏁板��',B.remark '澶囨敞'
+ from TMouldchk_Proc_Main A
+ left join TMouldchk_Proc_Deta B on A.id=B.m_id
+ left join TMouldInfo E on A.mould_code=E.code
+ left join TMouldchk_Main M on A.mouldchkmain_code=M.code
+ left join TMouldchk_Item H on B.mouldchkdeta_code=H.code
+ left join TUser U on A.chk_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 MouldRepairTakeSearch(string mouldcode, string mouldname, string mouldspec, string stanedcode, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (stanedcode != "" && stanedcode != null)
+ {
+ search += "and M.code like '%'+@stanedcode+'%' ";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ }
+ if (stanedname != "" && stanedname != null)
+ {
+ search += "and M.name like '%'+@stanedname+'%' ";
+ dynamicParams.Add("@stanedname", stanedname);
+ }
+ if (repairuser != "" && repairuser != null)
+ {
+ search += "and U.username like '%'+@repairuser+'%' ";
+ dynamicParams.Add("@repairuser", repairuser);
+ }
+ if (repairopendate != "" && repairopendate != null)
+ {
+ search += "and A.maint_date between @repairopendate and @repairclosedate ";
+ dynamicParams.Add("@repairopendate", repairopendate + " 00:00:00");
+ dynamicParams.Add("@repairclosedate", repairclosedate + " 23:59:59");
+ }
+ if (repairresult != "" && repairresult != null)
+ {
+ search += "and A.maint_result=@repairresult ";
+ dynamicParams.Add("@repairresult", repairresult);
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ 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
+ left join TMouldmai_Main M on A.mouldmaint_code=M.code
+ left join TUser U on A.maint_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 MouldRepairSubTakeSearch(string id)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select A.seq,T.code as itemcode,T.name as itemname,A.result,A.maint_value,A.remark
+ from TMouldmaint_Proc_Deta A
+ left join TMouldmai_Item T on A.mouldmaideta_code=T.code
+ where A.m_id=@id";
+ dynamicParams.Add("@id", id);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇璁板綍瀵煎嚭]
+ public static ToMessage MouldRepairTakeOutExcel(string mouldcode, string mouldname, string mouldspec, string stanedcode, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
+ {
+ 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (stanedcode != "" && stanedcode != null)
+ {
+ search += "and M.code like '%'+@stanedcode+'%' ";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ }
+ if (stanedname != "" && stanedname != null)
+ {
+ search += "and M.name like '%'+@stanedname+'%' ";
+ dynamicParams.Add("@stanedname", stanedname);
+ }
+ if (repairuser != "" && repairuser != null)
+ {
+ search += "and U.username like '%'+@repairuser+'%' ";
+ dynamicParams.Add("@repairuser", repairuser);
+ }
+ if (repairopendate != "" && repairopendate != null)
+ {
+ search += "and A.maint_date between @repairopendate and @repairclosedate ";
+ dynamicParams.Add("@repairopendate", repairopendate + " 00:00:00");
+ dynamicParams.Add("@repairclosedate", repairclosedate + " 23:59:59");
+ }
+ if (repairresult != "" && repairresult != null)
+ {
+ search += "and A.maint_result=@repairresult ";
+ dynamicParams.Add("@repairresult", repairresult);
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN A.bywo
+ ELSE ''END AS '淇濆吇鍗曞彿',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN A.mould_code
+ ELSE ''END AS '妯″叿缂栫爜',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN E.name
+ ELSE ''END AS '妯″叿鍚嶇О',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN E.spec
+ ELSE ''END AS '瑙勬牸鍨嬪彿',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN A.mouldmaint_code
+ ELSE ''END AS '淇濆吇鏍囧噯缂栫爜',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN M.name
+ ELSE ''END AS '淇濆吇鏍囧噯鍚嶇О',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN U.username
+ ELSE ''END AS '淇濆吇浜哄憳',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.bywo ORDER BY B.mouldmaideta_code) = 1 THEN A.maint_result
+ ELSE ''END AS '淇濆吇缁撴灉',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.maint_date ORDER BY B.mouldmaideta_code) = 1 THEN A.maint_date
+ END AS '淇濆吇鏃堕棿',
+ B.seq as '淇濆吇閮ㄤ綅搴忓彿',H.code '淇濆吇閮ㄤ綅缂栫爜',H.name '淇濆吇閮ㄤ綅鍚嶇О',B.result '淇濆吇缁撴灉',B.maint_value '鏁板��',B.remark '澶囨敞'
+ from TMouldmaint_Proc_Main A
+ left join TMouldmaint_Proc_Deta B on A.id=B.m_id
+ left join TMouldInfo E on A.mould_code=E.code
+ left join TMouldmai_Main M on A.mouldmaint_code=M.code
+ left join TMouldmai_Item H on B.mouldmaideta_code=H.code
+ left join TUser U on A.maint_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 MouldUpdateSearch(string mouldcode, string mouldname, string mouldspec, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (reportuser != "" && reportuser != null)
+ {
+ search += "and U.username like '%'+@reportuser+'%' ";
+ dynamicParams.Add("@reportuser", reportuser);
+ }
+ if (repairuser != "" && repairuser != null)
+ {
+ search += "and R.username like '%'+@repairuser+'%' ";
+ dynamicParams.Add("@repairuser", repairuser);
+ }
+ if (vrifcatuser != "" && vrifcatuser != null)
+ {
+ search += "and V.username like '%'+@vrifcatuser+'%' ";
+ dynamicParams.Add("@vrifcatuser", vrifcatuser);
+ }
+ if (reportopendate != "" && reportopendate != null)
+ {
+ search += "and B.request_date between @reportopendate and @reportclosedate ";
+ dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
+ dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
+ }
+ if (repairopendate != "" && repairopendate != null)
+ {
+ search += "and A.repair_date between @repairopendate and @repairclosedate ";
+ dynamicParams.Add("@repairopendate", repairopendate + " 00:00:00");
+ dynamicParams.Add("@repairclosedate", repairclosedate + " 23:59:59");
+ }
+ if (vrifcatopendate != "" && vrifcatopendate != null)
+ {
+ search += "and A.verify_date between @vrifcatopendate and @vrifcatclosedate ";
+ dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
+ dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.repair_code,A.mould_code,E.name as mould_name,E.spec as mould_spec,U.username as request_person,B.request_date,
+ R.username as repair_person,A.repair_date,CAST(datediff(minute, B.request_date,A.repair_date)/60.0 AS decimal(9,1)) as cycleDate,
+ V.username as verify_person,A.verify_date,(case when A.verify_result='OK' then '閫氳繃' when A.verify_result='NG' then '涓嶉�氳繃' end)as verify_result
+ from TMould_Repair A
+ left join TMould_RepairRequest B on A.source_wo=B.docu_code
+ left join TMouldInfo E on A.mould_code=E.code
+ left join TUser U on B.request_person=U.usercode
+ left join TUser R on A.repair_person=R.usercode
+ left join TUser V on A.verify_person=V.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 MouldUpdateSubSearch(string repair_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ Dictionary<object, object> Dict = new Dictionary<object, object>();
+ try
+ {
+ //鑾峰彇妯″叿鎶ヤ慨鐢宠鏁版嵁
+ sql = @"select B.docu_code,
+ (
+ case when B.source='A' then '妯″叿鐐规'
+ when B.source='B' then '妯″叿淇濆吇'
+ when B.source='C' then '鎵嬪伐'
+ end
+ ) as source,B.failure_descript
+ from TMould_Repair A
+ left join TMould_RepairRequest B on A.source_wo=B.docu_code
+ where A.repair_code=@repair_code";
+ dynamicParams.Add("@repair_code", repair_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ DeviceReport report = new DeviceReport();
+ report.faultsource = data.Rows[0]["source"].ToString();
+ report.faultdescr = data.Rows[0]["failure_descript"].ToString();
+ //鑾峰彇妯″叿鎶ヤ慨鐢宠鍥剧墖鏁版嵁
+ sql = @"select M.img1url from TMould_Repair A
+ left join TMould_RepairRequest B on A.source_wo=B.docu_code
+ left join TMould_RepairImage M on B.docu_code=M.source_wo
+ where A.repair_code=@repair_code and M.wo_type='REPA'";
+ dynamicParams.Add("@repair_code", repair_code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ report.faultimage = data0;
+ Dict.Add("data1", report);
+
+ //鑾峰彇妯″叿缁翠慨鏁版嵁
+ sql = @"select A.failure_descript,A.is_shutdown,A.repair_content,A.repair_part
+ from TMould_Repair A
+ left join TMould_RepairRequest B on A.source_wo=B.docu_code
+ where A.repair_code=@repair_code";
+ dynamicParams.Add("@repair_code", repair_code);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ DeviceRepair repair = new DeviceRepair();
+ repair.faultdescr = data1.Rows[0]["failure_descript"].ToString();
+ repair.isstoprepair = data1.Rows[0]["is_shutdown"].ToString();
+ repair.repaircontent = data1.Rows[0]["repair_content"].ToString();
+ repair.repairpart = data1.Rows[0]["repair_part"].ToString();
+ //鑾峰彇妯″叿缁翠慨鍥剧墖鏁版嵁
+ sql = @"select M.img1url from TMould_Repair A
+ left join TMould_RepairImage M on A.repair_code=M.source_wo
+ where A.repair_code=@repair_code and M.wo_type='COMP'";
+ dynamicParams.Add("@repair_code", repair_code);
+ var data3 = DapperHelper.selectdata(sql, dynamicParams);
+ repair.repairimage = data3;
+ Dict.Add("data2", repair);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = Dict;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨璁板綍瀵煎嚭]
+ public static ToMessage MouldUpdateSearch(string mouldcode, string mouldname, string mouldspec, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
+ {
+ 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 E.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and E.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (reportuser != "" && reportuser != null)
+ {
+ search += "and U.username like '%'+@reportuser+'%' ";
+ dynamicParams.Add("@reportuser", reportuser);
+ }
+ if (repairuser != "" && repairuser != null)
+ {
+ search += "and R.username like '%'+@repairuser+'%' ";
+ dynamicParams.Add("@repairuser", repairuser);
+ }
+ if (vrifcatuser != "" && vrifcatuser != null)
+ {
+ search += "and V.username like '%'+@vrifcatuser+'%' ";
+ dynamicParams.Add("@vrifcatuser", vrifcatuser);
+ }
+ if (reportopendate != "" && reportopendate != null)
+ {
+ search += "and B.request_date between @reportopendate and @reportclosedate ";
+ dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
+ dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
+ }
+ if (repairopendate != "" && repairopendate != null)
+ {
+ search += "and A.repair_date between @repairopendate and @repairclosedate ";
+ dynamicParams.Add("@repairopendate", repairopendate + " 00:00:00");
+ dynamicParams.Add("@repairclosedate", repairclosedate + " 23:59:59");
+ }
+ if (vrifcatopendate != "" && vrifcatopendate != null)
+ {
+ search += "and A.verify_date between @vrifcatopendate and @vrifcatclosedate ";
+ dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
+ dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.repair_code as '缁翠慨鍗曞彿',A.mould_code as '妯″叿缂栫爜',E.name as '妯″叿鍚嶇О',E.spec as '瑙勬牸鍨嬪彿',
+ U.username as '鎶ヤ慨浜哄憳',B.request_date as '鎶ヤ慨鏃堕棿',R.username as '缁翠慨浜哄憳',A.repair_date as '缁翠慨鏃堕棿',
+ CAST(datediff(minute, B.request_date,A.repair_date)/60.0 AS decimal(9,1)) as '缁翠慨鏃堕暱',
+ V.username as '楠岃瘉浜哄憳',A.verify_date as '楠岃瘉鏃堕棿',(case when A.verify_result='OK' then '閫氳繃' when A.verify_result='NG' then '涓嶉�氳繃' end) as '楠岃瘉缁撴灉'
+ from TMould_Repair A
+ left join TMould_RepairRequest B on A.source_wo=B.docu_code
+ left join TMouldInfo E on A.mould_code=E.code
+ left join TUser U on B.request_person=U.usercode
+ left join TUser R on A.repair_person=R.usercode
+ left join TUser V on A.verify_person=V.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 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