From f330d41697dc8b2fbbd879ce8a9b644dab7cc31c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 十二月 2023 17:04:59 +0800
Subject: [PATCH] 1.设备基础资料,设备点检项目、设备点检标准导入接口
---
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 170 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 107 insertions(+), 63 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index 5583839..63d1012 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -32,7 +32,7 @@
sql = @"select code,name,'1' as isGroup,data_sources from TUnitGroup ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
LogHelper.OperateLog("999", "鏌ヨ", "璁¢噺鍗曚綅缁勬煡璇㈡暟鎹负锛�" + JsonConvert.SerializeObject(data), "PC");
}
@@ -40,7 +40,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -57,31 +57,43 @@
{
if (tunittype == "" || tunittype == null)
{
- sql = @"select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources
- from TUnit T where T.isGroup='0'
- union all
- select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources
- from TUnitGroup ";
+ sql = @"select AA.code,AA.name,U.username as lm_user,AA.lm_date,AA.isGroup,AA.idunitgroup,AA.data_sources
+ from(
+ select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources
+ from TUnit T
+ where T.isGroup='0'
+ union all
+ select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources
+ from TUnitGroup
+ ) as AA
+ left join TUser U on AA.lm_user=U.usercode ";
}
if (tunittype == "S") //鍗曡閲�
{
- sql = @"select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources from TUnit where isSingleUnit='1' and isGroup='0'";
+ sql = @"select T.code,T.name,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
+ from TUnit T
+ left join TUser U on T.lm_user=U.usercode
+ where T.isSingleUnit='1' and T.isGroup='0'";
}
if (tunittype == "M" && (tunitgroupcode == "" || tunitgroupcode == null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷负绌�
{
- sql = @"select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources from TUnitGroup";
+ sql = @"select T.code,T.name,U.usercode as lm_user,T.lm_date,'1' as isGroup,T.code as idunitgroup,T.data_sources
+ from TUnitGroup T
+ left join TUser U on T.lm_user=U.usercode";
}
if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷笉涓虹┖
{
- sql = @"select code,name,isMainUnit,changeRate,rateDescription,lm_user,lm_date,isGroup,idunitgroup,data_sources
- from TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@tunitgroupcode";
+ sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
+ from TUnit T
+ left join TUser U on T.lm_user=U.usercode
+ where T.isSingleUnit='0' and T.isGroup='1' and T.idunitgroup=@tunitgroupcode";
dynamicParams.Add("@tunitgroupcode", tunitgroupcode);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
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();
LogHelper.OperateLog("999", "鏌ヨ", "鏌ヨ浜嗚閲忓崟浣�", "PC");
@@ -90,7 +102,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -111,14 +123,14 @@
dynamicParams.Add("@tunitgroupcode", unitcode);
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;
@@ -150,7 +162,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -164,7 +176,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -218,14 +230,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細"+ tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), 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;
}
}
@@ -241,7 +253,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -274,7 +286,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -335,14 +347,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), 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;
}
}
@@ -351,7 +363,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -375,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -402,7 +414,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶氳閲忓崟浣嶇粍涓湁璁¢噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "澶氳閲忓崟浣嶇粍涓湁璁¢噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -441,7 +453,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -465,14 +477,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + tunittype == "S" ? tunitcode : tunittype == "M"&& (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)? tunitgroupcode: tunitgroupcode+"-->"+tunitcode, 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;
}
}
@@ -480,7 +492,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -498,7 +510,7 @@
sql = @"select code,name,idparent,data_sources from TMateriel_Class ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
LogHelper.OperateLog("999", "鏌ヨ", "瀛樿揣鍒嗙被鏌ヨ鏁版嵁涓猴細" + JsonConvert.SerializeObject(data), "PC");
}
@@ -506,7 +518,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -530,7 +542,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被涓婄骇涓嶈兘鏄凡鏈夊瓨璐х殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
+ mes.message = "瀛樿揣鍒嗙被涓婄骇涓嶈兘鏄凡鏈夊瓨璐х殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
mes.data = null;
return mes;
}
@@ -545,7 +557,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -557,7 +569,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -584,14 +596,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:"+ inventoryclasscode, 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;
}
}
@@ -606,7 +618,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -632,14 +644,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:"+ inventoryclasscode, 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;
}
}
@@ -648,7 +660,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -672,7 +684,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣鍒嗙被鎴栦笅绾ц寮曠敤涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣鍒嗙被鎴栦笅绾ц寮曠敤涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -693,14 +705,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�"+classcode, 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;
}
}
@@ -708,7 +720,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -750,7 +762,7 @@
M.idUnitByPurchase as idUnitByPurchasecode,P.name as idUnitByPurchasename,M.idUnitBySale as idUnitBySalecode,S.name as idUnitBySalename,
M.idunitbymanufacture as idunitbymanufacturecode,F.name as idunitbymanufacturename,M.idinventoryclass as idinventoryclasscode,C.name as idinventoryclassname,
M.isPurchase,M.isSale,M.isMadeSelf,M.isMaterial,M.isMadeRequest,M.idwarehouse as idwarehousecode,H.name as idwarehousename,M.lowQuantity,M.topQuantity,M.safeQuantity,
- M.status,M.lm_user,M.lm_date,M.data_sources
+ M.status,U.username as lm_user,M.lm_date,M.data_sources
from TMateriel_Info M
left join TUnit T on M.idunit=T.code
left join TUnit R on M.idSubUnitByReport=R.code
@@ -761,12 +773,13 @@
left join TMateriel_Class C on M.idinventoryclass=C.code
left join TUnitGroup G on M.idunitgroup=G.code
left join TSecStck H on M.idwarehouse=H.code
+ left join TUser U on M.lm_user=U.usercode
where 1=1 " + search;
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
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();
}
@@ -774,7 +787,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -799,7 +812,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣妗f缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣妗f缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -811,7 +824,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗f鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗f鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -823,7 +836,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗f瑙勬牸宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗f瑙勬牸宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -868,14 +881,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:"+ partcode, 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;
}
}
@@ -890,7 +903,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣妗f鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣妗f鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -903,7 +916,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗f瑙勬牸鍨嬪彿宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗f瑙勬牸鍨嬪彿宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -946,14 +959,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:"+ partcode, 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;
}
}
@@ -962,7 +975,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -985,7 +998,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣鍒嗗凡琚紩鐢╗鐢熶骇璁㈠崟]涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣鍒嗗凡琚紩鐢╗鐢熶骇璁㈠崟]涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -997,7 +1010,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣宸茶寮曠敤[鐢熶骇宸ュ崟]涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣宸茶寮曠敤[鐢熶骇宸ュ崟]涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -1019,14 +1032,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:"+partcode, 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;
}
}
@@ -1034,7 +1047,38 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[宸ュ崟浜у搧淇℃伅涓嬫媺妗嗘煡璇
+ public static ToMessage PartSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇鐗╂枡鏁版嵁
+ sql = @"select M.partcode,M.partname,M.partspec,M.idunit as uom_code,T.name as uom_name,
+ M.idunitgroup as stocktype_code,D.name as stocktype_name,
+ M.idwarehouse as stck_code,S.name as stck_name
+ from TMateriel_Info M
+ left join TUnit T on M.idunit=T.code
+ left join TUnitGroup D on M.idunitgroup=D.code
+ left join TSecStck S on M.idwarehouse=S.code ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
--
Gitblit v1.9.3