From b59b0e3516caee784ab9aa74e5b9dd1dfbffaa2d Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 18 十二月 2023 19:29:15 +0800
Subject: [PATCH] 1.修改Excel导入时双模板数据校验方法

---
 VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs |  900 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 660 insertions(+), 240 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 148d517..713538e 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -68,7 +68,7 @@
                 }
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
-                var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
+                var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,A.location_code,L.name as location_name,
                            A.surp_life,(select isnull(sum(usecount_life),0)   from TMould_UpDownReord R where R.mould_code=A.code) as serlife,
                            A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
                            STUFF((SELECT ',' + B.partcode
@@ -78,6 +78,7 @@
                            A.lm_user as usercode,U.username,A.lm_date   
                            from TMouldInfo A
                            left join TSecStck S on A.warehousecode=S.code
+                           left join TSecLoca L on A.location_code=L.code
                            left join (
                            select distinct mouldcode from TMouldInfoPart 
                            )  M on A.code=M.mouldcode
@@ -85,7 +86,7 @@
                            where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -93,7 +94,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -153,14 +154,14 @@
                         LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿:" + mouldcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.message = "鏂板鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.message = "鏂板鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -219,14 +220,14 @@
                         LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿:" + mouldcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.message = "淇敼鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.message = "淇敼鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -235,7 +236,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -297,7 +298,7 @@
                             ) as AA where 1=1 "+search+"  order by AA.operdate desc ";
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -305,7 +306,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -339,7 +340,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
+                    mes.message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
                     mes.data = null;
                     return mes;
                 }
@@ -363,14 +364,14 @@
                     LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎鎴愬姛!";
+                    mes.message = "鍒犻櫎鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎澶辫触!";
+                    mes.message = "鍒犻櫎澶辫触!";
                     mes.data = null;
                 }
 
@@ -379,7 +380,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -422,7 +423,7 @@
                                 where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -430,7 +431,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -459,14 +460,14 @@
                         LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.message = "鏂板鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.message = "鏂板鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -487,14 +488,14 @@
                         LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.message = "淇敼鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.message = "淇敼鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -503,7 +504,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -528,7 +529,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+                    mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
                     mes.data = null;
                     return mes;
                 }
@@ -543,14 +544,14 @@
                     LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎鎴愬姛!";
+                    mes.message = "鍒犻櫎鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎澶辫触!";
+                    mes.message = "鍒犻櫎澶辫触!";
                     mes.data = null;
                 }
 
@@ -559,7 +560,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -602,7 +603,7 @@
                             where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -610,7 +611,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -641,7 +642,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+                    mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -654,14 +655,14 @@
                 rout.Data = data0;
 
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = rout;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -708,14 +709,14 @@
                         LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.message = "鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.message = "鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -755,14 +756,14 @@
                         LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.message = "鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.message = "鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -771,7 +772,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -793,7 +794,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+                    mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
                     mes.data = null;
                     return mes;
                 }
@@ -813,14 +814,14 @@
                     LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
+                    mes.message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
+                    mes.message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
                     mes.data = null;
                 }
             }
@@ -828,7 +829,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -861,13 +862,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳ā鍏疯祫鏂�!";
+                    mes.message = "鏃犳ā鍏疯祫鏂�!";
                     mes.data = null;
                 }
             }
@@ -875,7 +876,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -931,14 +932,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规鏍囧噯鍏宠仈妯″叿", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.message = "鎿嶄綔鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鎿嶄綔澶辫触!";
+                    mes.message = "鎿嶄綔澶辫触!";
                     mes.data = null;
                 }
             }
@@ -946,7 +947,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -989,7 +990,7 @@
                                 where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -997,7 +998,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1026,14 +1027,14 @@
                         LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.message = "鏂板鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.message = "鏂板鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -1054,14 +1055,14 @@
                         LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.message = "淇敼鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.message = "淇敼鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -1070,7 +1071,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1095,7 +1096,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+                    mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
                     mes.data = null;
                     return mes;
                 }
@@ -1110,14 +1111,14 @@
                     LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎鎴愬姛!";
+                    mes.message = "鍒犻櫎鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鍒犻櫎澶辫触!";
+                    mes.message = "鍒犻櫎澶辫触!";
                     mes.data = null;
                 }
 
@@ -1126,7 +1127,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1169,7 +1170,7 @@
                             where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -1177,7 +1178,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1208,7 +1209,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+                    mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -1221,14 +1222,14 @@
                 rout.Data = data0;
 
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = rout;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1275,14 +1276,14 @@
                         LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.message = "鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.message = "鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -1322,14 +1323,14 @@
                         LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔鎴愬姛!";
+                        mes.message = "鎿嶄綔鎴愬姛!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
                         mes.count = 0;
-                        mes.Message = "鎿嶄綔澶辫触!";
+                        mes.message = "鎿嶄綔澶辫触!";
                         mes.data = null;
                     }
                 }
@@ -1338,7 +1339,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1360,7 +1361,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+                    mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
                     mes.data = null;
                     return mes;
                 }
@@ -1380,14 +1381,14 @@
                     LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
+                    mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
+                    mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
                     mes.data = null;
                 }
             }
@@ -1395,7 +1396,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1428,13 +1429,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳ā鍏疯祫鏂�!";
+                    mes.message = "鏃犳ā鍏疯祫鏂�!";
                     mes.data = null;
                 }
             }
@@ -1442,7 +1443,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1498,14 +1499,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.message = "鎿嶄綔鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鎿嶄綔澶辫触!";
+                    mes.message = "鎿嶄綔澶辫触!";
                     mes.data = null;
                 }
             }
@@ -1513,7 +1514,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1537,13 +1538,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+                    mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
                     mes.data = data;
                 }
             }
@@ -1551,7 +1552,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1574,13 +1575,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
+                    mes.message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
                     mes.data = data;
                 }
             }
@@ -1588,7 +1589,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1615,13 +1616,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
+                    mes.message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
                     mes.data = data;
                 }
             }
@@ -1629,7 +1630,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1660,7 +1661,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+                    mes.message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
                     mes.data = null;
                     return mes;
                 }
@@ -1710,14 +1711,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规", "妯″叿:" + json.code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "鐐规鎴愬姛!";
+                    mes.message = "鐐规鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鐐规澶辫触!";
+                    mes.message = "鐐规澶辫触!";
                     mes.data = null;
                 }
             }
@@ -1725,7 +1726,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1749,13 +1750,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+                    mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
                     mes.data = data;
                 }
             }
@@ -1763,7 +1764,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1786,13 +1787,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
+                    mes.message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
                     mes.data = data;
                 }
             }
@@ -1800,7 +1801,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1827,13 +1828,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
+                    mes.message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
                     mes.data = data;
                 }
             }
@@ -1841,7 +1842,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1872,7 +1873,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+                    mes.message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
                     mes.data = null;
                     return mes;
                 }
@@ -1922,14 +1923,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇", "妯″叿:" + json.code, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "淇濆吇鎴愬姛!";
+                    mes.message = "淇濆吇鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "淇濆吇澶辫触!";
+                    mes.message = "淇濆吇澶辫触!";
                     mes.data = null;
                 }
             }
@@ -1937,7 +1938,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -1965,14 +1966,14 @@
                 if (dt.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = dt;
                     return mes;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+                    mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
                     mes.data = null;
                     return mes;
                 }
@@ -1982,7 +1983,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2051,14 +2052,14 @@
                     }
                     list.Add(moud);
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = list;
                     return mes;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+                    mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
                     mes.data = null;
                     return mes;
                 }
@@ -2067,7 +2068,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2092,17 +2093,17 @@
                     {
                         case "0": //鍦ㄥ簱
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
+                            mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
                             mes.data = null;
                             return mes;
                         case "2": //涓婃満
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
+                            mes.message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
                             mes.data = null;
                             return mes;
                         case "7": //澶栧��
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
+                            mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
                             mes.data = null;
                             return mes;
                         default:
@@ -2112,7 +2113,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -2128,13 +2129,13 @@
                     if (rows.Length > 0)
                     {
                         mes.code = "300";
-                        mes.Message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
+                        mes.message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
                         mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
+                        mes.message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
                         mes.data = null;
                     }
                 }
@@ -2149,13 +2150,13 @@
                     if (data.Rows.Count > 0)
                     {
                         mes.code = "200";
-                        mes.Message = "鏌ヨ鎴愬姛!";
+                        mes.message = "鏌ヨ鎴愬姛!";
                         mes.data = data;
                     }
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+                        mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
                         mes.data = data;
                     }
                 }
@@ -2164,7 +2165,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2258,14 +2259,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨鐢宠", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "缁翠慨鐢宠鎴愬姛!";
+                    mes.message = "缁翠慨鐢宠鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "缁翠慨鐢宠澶辫触!";
+                    mes.message = "缁翠慨鐢宠澶辫触!";
                     mes.data = null;
                 }
             }
@@ -2273,7 +2274,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2306,13 +2307,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏆傛棤缁翠慨鐢宠璁板綍!";
+                    mes.message = "鏆傛棤缁翠慨鐢宠璁板綍!";
                     mes.data = data;
                 }
             }
@@ -2320,7 +2321,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2418,14 +2419,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "缁翠慨鎴愬姛!";
+                    mes.message = "缁翠慨鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "缁翠慨澶辫触!";
+                    mes.message = "缁翠慨澶辫触!";
                     mes.data = null;
                 }
             }
@@ -2433,7 +2434,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2465,13 +2466,13 @@
                 if (data.Rows.Count > 0)
                 {
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = data;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏆傛棤缁翠慨璁板綍!";
+                    mes.message = "鏆傛棤缁翠慨璁板綍!";
                     mes.data = data;
                 }
             }
@@ -2479,7 +2480,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2515,13 +2516,13 @@
                     }
                     dict.Add("repair_content", data.Rows[0]["repair_content"].ToString()); //缁翠慨鍐呭
                     mes.code = "200";
-                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.message = "鏌ヨ鎴愬姛!";
                     mes.data = dict;
                 }
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏆傛棤缁翠慨璁板綍!";
+                    mes.message = "鏆傛棤缁翠慨璁板綍!";
                     mes.data = null;
                 }
             }
@@ -2529,7 +2530,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2604,14 +2605,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨楠岃瘉", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "缁翠慨楠岃瘉鎴愬姛!";
+                    mes.message = "缁翠慨楠岃瘉鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "缁翠慨楠岃瘉澶辫触!";
+                    mes.message = "缁翠慨楠岃瘉澶辫触!";
                     mes.data = null;
                 }
             }
@@ -2619,7 +2620,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2648,22 +2649,22 @@
                         {
                             case "0": //鍦ㄥ簱
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+                                mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "2": //涓婃満
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+                                mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "7": //澶栧��
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
+                                mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
                                 mes.data = null;
                                 return mes;
                             default:
                                 mes.code = "200";
-                                mes.Message = "鏌ヨ鎴愬姛!";
+                                mes.message = "鏌ヨ鎴愬姛!";
                                 mes.data = dt;
                                 break;
                         }
@@ -2671,7 +2672,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
                         mes.data = null;
                         return mes;
                     }
@@ -2679,7 +2680,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -2689,7 +2690,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2709,14 +2710,14 @@
                         )";
                 var data = DapperHelper.selectdata(sql, dynamicParams);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = data;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2759,14 +2760,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿涓婃満", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿涓婃満鎴愬姛!";
+                    mes.message = "妯″叿涓婃満鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿涓婃満澶辫触!";
+                    mes.message = "妯″叿涓婃満澶辫触!";
                     mes.data = null;
                 }
             }
@@ -2774,7 +2775,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2810,14 +2811,14 @@
                         if (data.Rows.Count > 0)
                         {
                             mes.code = "200";
-                            mes.Message = "鏌ヨ鎴愬姛!";
+                            mes.message = "鏌ヨ鎴愬姛!";
                             mes.data = data;
                             return mes;
                         }
                         else
                         {
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
+                            mes.message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
                             mes.data = null;
                             return mes;
                         }
@@ -2825,7 +2826,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
                         mes.data = null;
                         return mes;
                     }
@@ -2833,7 +2834,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -2843,7 +2844,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2901,14 +2902,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿涓嬫満", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿涓嬫満鎴愬姛!";
+                    mes.message = "妯″叿涓嬫満鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿涓嬫満澶辫触!";
+                    mes.message = "妯″叿涓嬫満澶辫触!";
                     mes.data = null;
                 }
             }
@@ -2916,7 +2917,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -2945,22 +2946,22 @@
                         {
                             case "0": //鍦ㄥ簱
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+                                mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "2": //涓婃満
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+                                mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "7": //澶栧��
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
+                                mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
                                 mes.data = null;
                                 return mes;
                             default:
                                 mes.code = "200";
-                                mes.Message = "鏌ヨ鎴愬姛!";
+                                mes.message = "鏌ヨ鎴愬姛!";
                                 mes.data = dt;
                                 break;
                         }
@@ -2968,7 +2969,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
                         mes.data = null;
                         return mes;
                     }
@@ -2976,7 +2977,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -2986,7 +2987,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3029,14 +3030,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿澶栧��", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿澶栧�熸垚鍔�!";
+                    mes.message = "妯″叿澶栧�熸垚鍔�!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿澶栧�熷け璐�!";
+                    mes.message = "妯″叿澶栧�熷け璐�!";
                     mes.data = null;
                 }
             }
@@ -3044,7 +3045,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3079,14 +3080,14 @@
                         if (data.Rows.Count > 0)
                         {
                             mes.code = "200";
-                            mes.Message = "鏌ヨ鎴愬姛!";
+                            mes.message = "鏌ヨ鎴愬姛!";
                             mes.data = data;
                             return mes;
                         }
                         else
                         {
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
+                            mes.message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
                             mes.data = null;
                             return mes;
                         }
@@ -3094,7 +3095,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
                         mes.data = null;
                         return mes;
                     }
@@ -3102,7 +3103,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -3112,7 +3113,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3159,14 +3160,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿褰掕繕", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿褰掕繕鎴愬姛!";
+                    mes.message = "妯″叿褰掕繕鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿褰掕繕澶辫触!";
+                    mes.message = "妯″叿褰掕繕澶辫触!";
                     mes.data = null;
                 }
             }
@@ -3174,7 +3175,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3203,22 +3204,22 @@
                         {
                             case "0": //鍦ㄥ簱
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+                                mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "2": //涓婃満
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+                                mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
                                 mes.data = null;
                                 return mes;
                             case "7": //澶栧��
                                 mes.code = "300";
-                                mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
+                                mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
                                 mes.data = null;
                                 return mes;
                             default:
                                 mes.code = "200";
-                                mes.Message = "鏌ヨ鎴愬姛!";
+                                mes.message = "鏌ヨ鎴愬姛!";
                                 mes.data = dt;
                                 break;
                         }
@@ -3226,7 +3227,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
                         mes.data = null;
                         return mes;
                     }
@@ -3234,7 +3235,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -3244,7 +3245,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3252,7 +3253,7 @@
         #endregion
 
         #region[妯″叿鍏ュ簱鎻愪氦]
-        public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+        public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
         {
             var sql = "";
             List<object> list = new List<object>();
@@ -3261,8 +3262,8 @@
             {
                 list.Clear();
                 //鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍏ュ簱鎿嶄綔)
-                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date) 
-                        values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date) 
+                        values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
                 list.Add(new
                 {
                     str = sql,
@@ -3271,6 +3272,7 @@
                         mould_code = mouldcode,
                         type = "IN",
                         warehouse_code = warehousecode,
+                        location_code = locationcode,
                         description = description,
                         lm_user = us.usercode,
                         lm_date = DateTime.Now.ToString()
@@ -3278,8 +3280,8 @@
                 });
 
                 //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍏ュ簱),浠撳簱缂栫爜
-                sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode  where code=@mouldcode";
-                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });
+                sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode,location_code=@location_code  where code=@mouldcode";
+                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode, location_code = locationcode } });
 
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
@@ -3288,14 +3290,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿鍏ュ簱", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿鍏ュ簱鎴愬姛!";
+                    mes.message = "妯″叿鍏ュ簱鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿鍏ュ簱澶辫触!";
+                    mes.message = "妯″叿鍏ュ簱澶辫触!";
                     mes.data = null;
                 }
             }
@@ -3303,7 +3305,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3329,23 +3331,24 @@
                     {
                         //鍒ゆ柇褰撳墠妯″叿鏄惁鍦ㄥ鍊熺姸鎬�
                         sql = @"select M.code as mould_code,M.name as mould_name,M.spec as mould_spec,
-                                M.surp_life,M.resi_life,M.warehousecode,C.name as  warehousename 
+                                M.surp_life,M.resi_life,M.warehousecode,C.name as  warehousename,M.location_code,L.name as location_name 
                                 from TMouldInfo M 
                                 left join TSecStck C on M.warehousecode=C.code
+                                left join TSecLoca L on M.location_code=L.code
                                 where M.code=@mouldcode and M.usestatus='0'";
                         dynamicParams.Add("@mouldcode", mouldcode);
                         var data = DapperHelper.selectdata(sql, dynamicParams);
                         if (data.Rows.Count > 0)
                         {
                             mes.code = "200";
-                            mes.Message = "鏌ヨ鎴愬姛!";
+                            mes.message = "鏌ヨ鎴愬姛!";
                             mes.data = data;
                             return mes;
                         }
                         else
                         {
                             mes.code = "300";
-                            mes.Message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
+                            mes.message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
                             mes.data = null;
                             return mes;
                         }
@@ -3353,7 +3356,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+                        mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
                         mes.data = null;
                         return mes;
                     }
@@ -3361,7 +3364,7 @@
                 else
                 {
                     mes.code = "300";
-                    mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+                    mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
                     mes.data = null;
                     return mes;
                 }
@@ -3371,7 +3374,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3379,7 +3382,7 @@
         #endregion
 
         #region[妯″叿鍑哄簱鎻愪氦]
-        public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+        public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
         {
             var sql = "";
             List<object> list = new List<object>();
@@ -3388,8 +3391,8 @@
             {
                 list.Clear();
                 //鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍑哄簱鎿嶄綔)
-                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date) 
-                        values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date) 
+                        values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
                 list.Add(new
                 {
                     str = sql,
@@ -3398,6 +3401,7 @@
                         mould_code = mouldcode,
                         type = "OUT",
                         warehouse_code = warehousecode,
+                        location_code= locationcode,
                         description = description,
                         lm_user = us.usercode,
                         lm_date = DateTime.Now.ToString()
@@ -3405,8 +3409,8 @@
                 });
 
                 //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍑哄簱),娓呴櫎浠撳簱缂栫爜
-                sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode  where code=@mouldcode";
-                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });
+                sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode,location_code=@location_code  where code=@mouldcode";
+                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="", location_code="" } });
 
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
@@ -3415,14 +3419,14 @@
                     LogHelper.DbOperateLog(us.usercode, "妯″叿鍑哄簱", "妯″叿:" + mouldcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "妯″叿鍑哄簱鎴愬姛!";
+                    mes.message = "妯″叿鍑哄簱鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "妯″叿鍑哄簱澶辫触!";
+                    mes.message = "妯″叿鍑哄簱澶辫触!";
                     mes.data = null;
                 }
             }
@@ -3430,7 +3434,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3497,7 +3501,7 @@
                             where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -3505,7 +3509,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3527,14 +3531,14 @@
                 var data = DapperHelper.selectdata(sql, dynamicParams);
 
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = data;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3631,7 +3635,7 @@
                 data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
                 string msg = DownLoad.DataTableToExcel(data, "妯″叿鐐规璁板綍鎶ヨ〃");
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = msg;
             }
@@ -3639,7 +3643,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3695,14 +3699,9 @@
                     search += "and A.maint_result=@repairresult ";
                     dynamicParams.Add("@repairresult", repairresult);
                 }
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
-                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
-                var sql = @"select A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
+                var sql = @"select A.id,A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
                             U.username as maint_user,A.maint_result,A.maint_date
                             from TMouldmaint_Proc_Main A
                             left join TMouldInfo E on A.mould_code=E.code
@@ -3711,7 +3710,7 @@
                             where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -3719,7 +3718,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3741,14 +3740,14 @@
                 var data = DapperHelper.selectdata(sql, dynamicParams);
 
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = data;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3803,10 +3802,6 @@
                     search += "and A.maint_result=@repairresult ";
                     dynamicParams.Add("@repairresult", repairresult);
                 }
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
                 //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
@@ -3850,7 +3845,7 @@
                 data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
                 string msg = DownLoad.DataTableToExcel(data, "妯″叿淇濆吇璁板綍鎶ヨ〃");
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = msg;
             }
@@ -3858,7 +3853,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -3921,11 +3916,6 @@
                     dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
                     dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
                 }
-
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
                 //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
@@ -3941,7 +3931,7 @@
                             where 1=1 " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
             }
@@ -3949,7 +3939,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -4011,14 +4001,14 @@
                 repair.repairimage = data3;
                 Dict.Add("data2", repair);
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = Dict;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -4080,11 +4070,6 @@
                     dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
                     dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
                 }
-
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
                 //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
@@ -4103,7 +4088,7 @@
                 data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
                 string msg = DownLoad.DataTableToExcel(data, "妯″叿缁翠慨璁板綍鎶ヨ〃");
                 mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = msg;
             }
@@ -4111,7 +4096,442 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+
+        #region[妯″叿涓婁笅鏈鸿褰曟煡璇
+        public static ToMessage MouldUpDownMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (devicecode != "" && devicecode != null)
+                {
+                    search += "and A.eqp_code=@devicecode ";
+                    dynamicParams.Add("@devicecode", devicecode);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,
+                            (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as type,A.usecount_life,
+                            A.eqp_code,E.name as eqp_name,U.username as lm_user,A.lm_date  
+                            from TMould_UpDownReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TEqpInfo E on A.eqp_code=E.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = data.ToList();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[妯″叿涓婁笅鏈鸿瀵煎嚭Excel]
+        public static ToMessage MouldUpDownMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (devicecode != "" && devicecode != null)
+                {
+                    search += "and A.eqp_code=@devicecode ";
+                    dynamicParams.Add("@devicecode", devicecode);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '妯″叿瑙勬牸',
+                            (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as '鎿嶄綔绫诲瀷',A.usecount_life as '鏈浣跨敤',
+                            A.eqp_code as '璁惧缂栫爜',E.name as '璁惧鍚嶇О',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'  
+                            from TMould_UpDownReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TEqpInfo E on A.eqp_code=E.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+                data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+                string msg = DownLoad.DataTableToExcel(data, "妯″叿涓婁笅鏈鸿褰曟姤琛�");
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = msg;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+
+        #region[妯″叿鍊熻繕璁板綍鏌ヨ]
+        public static ToMessage MouldCirculateMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,  
+                            (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as type,
+                            A.description,U.username as lm_user,A.lm_date  
+                            from TMould_LendOutReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = data.ToList();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[妯″叿鍊熻繕璁板綍瀵煎嚭]
+        public static ToMessage MouldCirculateMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '瑙勬牸鍨嬪彿',  
+                            (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as '鎿嶄綔绫诲瀷',
+                            A.description as '鎻忚堪',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'  
+                            from TMould_LendOutReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+                data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+                string msg = DownLoad.DataTableToExcel(data, "妯″叿鍊熻繕璁板綍鎶ヨ〃");
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = msg;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+
+        #region[妯″叿鍑哄叆搴撹褰曟煡璇
+        public static ToMessage MouldInOutMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (warehousecode != "" && warehousecode != null)
+                {
+                    search += "and A.warehouse_code=@warehousecode ";
+                    dynamicParams.Add("@warehousecode", warehousecode);
+                }
+                if (locationcode != "" && locationcode != null)
+                {
+                    search += "and A.location_code=@locationcode ";
+                    dynamicParams.Add("@locationcode", locationcode);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,A.warehouse_code,S.name as warehouse_name,
+                            A.location_code,L.name as location_name,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as type,
+                            A.description,U.username as lm_user,A.lm_date  
+                            from TMould_InOutReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TSecStck S on A.warehouse_code=S.code
+                            left join TSecLoca L on A.location_code=L.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = data.ToList();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+        public static ToMessage MouldInOutMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mouldcode != "" && mouldcode != null)
+                {
+                    search += "and A.mould_code like '%'+@mouldcode+'%' ";
+                    dynamicParams.Add("@mouldcode", mouldcode);
+                }
+                if (mouldname != "" && mouldname != null)
+                {
+                    search += "and M.name like '%'+@mouldname+'%' ";
+                    dynamicParams.Add("@mouldname", mouldname);
+                }
+                if (mouldspec != "" && mouldspec != null)
+                {
+                    search += "and M.spec like '%'+@mouldspec+'%' ";
+                    dynamicParams.Add("@mouldspec", mouldspec);
+                }
+                if (type != "" && type != null)
+                {
+                    search += "and A.type=@type ";
+                    dynamicParams.Add("@type", type);
+                }
+                if (warehousecode != "" && warehousecode != null)
+                {
+                    search += "and A.warehouse_code=@warehousecode ";
+                    dynamicParams.Add("@warehousecode", warehousecode);
+                }
+                if (locationcode != "" && locationcode != null)
+                {
+                    search += "and A.location_code=@locationcode ";
+                    dynamicParams.Add("@locationcode", locationcode);
+                }
+                if (operuser != "" && operuser != null)
+                {
+                    search += "and U.username like '%'+@operuser+'%' ";
+                    dynamicParams.Add("@operuser", operuser);
+                }
+                if (opendate != "" && opendate != null)
+                {
+                    search += "and A.lm_date between @opendate and @closedate ";
+                    dynamicParams.Add("@opendate", opendate + " 00:00:00");
+                    dynamicParams.Add("@closedate", closedate + " 23:59:59");
+                }
+                //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.mould_code as 妯″叿缂栫爜,M.name as 妯″叿鍚嶇О,M.spec as 瑙勬牸鍨嬪彿,A.warehouse_code as 浠撳簱缂栫爜,S.name as 浠撳簱鍚嶇О,
+                            A.location_code as 搴撲綅缂栫爜,L.name as 搴撲綅鍚嶇О,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as 鎿嶄綔绫诲瀷,
+                            A.description as 鎻忚堪,U.username as 鎿嶄綔浜�,A.lm_date as 鎿嶄綔鏃堕棿  
+                            from TMould_InOutReord A
+                            left join TMouldInfo M on A.mould_code=M.code
+                            left join TSecStck S on A.warehouse_code=S.code
+                            left join TSecLoca L on A.location_code=L.code
+                            left join TUser U on A.lm_user=U.usercode
+                            where 1=1 " + search;
+                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+                data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+                string msg = DownLoad.DataTableToExcel(data, "妯″叿鍑哄叆搴撹褰曟姤琛�");
+                mes.code = "200";
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = msg;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;

--
Gitblit v1.9.3