From b166c0f80252ab4e1af4136789cb976364b779b2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 21 十一月 2022 15:12:04 +0800
Subject: [PATCH] 大岛的登陆接口存redis加企业区分
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 1193584..0f1e6ff 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -925,8 +925,8 @@
string sql0 = @"select ISNULL(IDENT_CURRENT('TBom_Main')+1,1) as id";
var dt = DapperHelper.selecttable(sql0);
//鍐欏叆BOM涓昏〃
- sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date)
- values(@materiel_code,@quantity,@status,@version,@username,@CreateDate)";
+ sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date,startdate)
+ values(@materiel_code,@quantity,@status,@version,@username,@CreateDate,@startdate)";
list.Add(new
{
str = sql,
@@ -937,7 +937,8 @@
status = status,
version = version,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ startdate = startdate
}
});
//鍐欏叆BOM瀛愯〃
@@ -985,12 +986,12 @@
str = sql,
parm = new
{
- id = bomid,
+ bomid = bomid,
materiel_code = parentpartcode,
quantity = quantity,
status = status,
- username = username,
- CreateDate = DateTime.Now.ToString()
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
}
});
//鍒犻櫎BOM瀛愯〃
@@ -1000,7 +1001,7 @@
str = sql,
parm = new
{
- id = bomid
+ bomid = bomid
}
});
//鍐欏叆BOM瀛愯〃
@@ -1058,6 +1059,18 @@
var dynamicParams = new DynamicParameters();
try
{
+ //鍒ゆ柇鐗╂枡绫诲瀷鏄惁鏈夊叧鑱旂墿鏂�
+ sql = @"select materiel_code from TK_Wrk_Man where materiel_code in (select materiel_code from TBom_Main where id=@bomid ) and bom_id=@bomid";
+ dynamicParams.Add("@bomid", bomid);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠鐗╂枡娓呭崟宸茶宸ュ崟鍏宠仈浣跨敤,涓嶅厑璁镐慨鏀�!";
+ mes.data = null;
+ return mes;
+ }
//鑾峰彇Bom瀛愯〃鏁版嵁
sql = @"select A.seq,B.partcode,B.partname,B.partspec,B.uom_code,T.name as uom_name,
A.base_quantity,A.loss_quantity,A.total_quantity,A.pn_type
@@ -1137,8 +1150,6 @@
return mes;
}
#endregion
-
-
#region[宸ヨ壓璺嚎鏌ヨ]
@@ -1327,6 +1338,7 @@
mes.count = 0;
mes.Message = "宸ヨ壓璺嚎宸茶宸ュ崟寮曠敤锛屼笉鍏佽鍒犻櫎!";
mes.data = null;
+ return mes;
}
else
{
@@ -1340,6 +1352,7 @@
mes.count = 0;
mes.Message = "宸ヨ壓璺嚎宸茶缃妭鎷嶅伐浠凤紝璇峰厛鍒犻櫎璁剧疆!";
mes.data = null;
+ return mes;
}
else
{
@@ -1353,21 +1366,23 @@
sql = @"delete TMateriel_Route where route_code=@routecode";
list.Add(new { str = sql, parm = new { routecode = routecode } });
}
- }
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
- mes.data = null;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
- mes.data = null;
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ return mes;
+ }
}
}
catch (Exception e)
@@ -1376,6 +1391,7 @@
mes.count = 0;
mes.Message = e.Message;
mes.data = null;
+ return mes;
}
return mes;
}
--
Gitblit v1.9.3