From 14a48ba934fabee90b5d52471ca47883f6007732 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 20 七月 2022 11:40:39 +0800
Subject: [PATCH] Excel 角色清单导入，工序检验扫码
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 112 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 20 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index f0cf516..aee0a95 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -29,23 +29,25 @@
{
if (defectcode != "" && defectcode != null)
{
- search += "and code=@defectcode ";
+ search += "and A.code=@defectcode ";
dynamicParams.Add("@defectcode", defectcode);
}
if (defectname != "" && defectname != null)
{
- search += "and name like '%'+@defectname+'%' ";
+ search += "and A.name like '%'+@defectname+'%' ";
dynamicParams.Add("@defectname", defectname);
}
if (defectdescr != "" && defectdescr != null)
{
- search += "and descr like '%'+@defectdescr+'%' ";
+ search += "and A.descr like '%'+@defectdescr+'%' ";
dynamicParams.Add("@defectdescr", defectdescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TDefect where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TDefect A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -61,6 +63,7 @@
}
return mes;
}
+
#endregion
#region[璐ㄩ噺绠＄悊锛岀己闄峰畾涔夋柊澧炪�佺紪杈戞彁浜
@@ -208,23 +211,25 @@
{
if (stanedcode != "" && stanedcode != null)
{
- search += "and code=@stanedcode ";
+ search += "and A.code=@stanedcode ";
dynamicParams.Add("@stanedcode", stanedcode);
}
if (stanedname != "" && stanedname != null)
{
- search += "and name like '%'+@stanedname+'%' ";
+ search += "and A.name like '%'+@stanedname+'%' ";
dynamicParams.Add("@stanedname", stanedname);
}
if (staneddescr != "" && staneddescr != null)
{
- search += "and descr like '%'+@staneddescr+'%' ";
+ search += "and A.descr like '%'+@staneddescr+'%' ";
dynamicParams.Add("@staneddescr", staneddescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TStepCheckStandard where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckStandard A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -255,12 +260,21 @@
where code=@defectcode and is_delete<>'1'";
dynamicParams.Add("@defectcode", defectcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
-
RoutEdit rout = new RoutEdit();
- rout.code = data.Rows[0]["CODE"].ToString();
- rout.name = data.Rows[0]["NAME"].ToString();
- rout.description = data.Rows[0]["DESCR"].ToString();
-
+ if (data.Rows.Count > 0)
+ {
+ rout.code = data.Rows[0]["CODE"].ToString();
+ rout.name = data.Rows[0]["NAME"].ToString();
+ rout.description = data.Rows[0]["DESCR"].ToString();
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犲伐搴忔楠屾爣鍑嗕俊鎭�!";
+ mes.data = null;
+ return mes;
+ }
//鏍规嵁宸ュ簭妫�楠屾爣鍑嗙紪鐮佽幏鍙栧叧鑱旂殑宸ュ簭妫�楠岄」鐩俊鎭�
sql = @"select B.code,B.name,A.stepcheckitem_desc from TStepCheckStandardSub A
left join TStepCheckItem B on A.stepcheckitem_code=B.code
@@ -296,6 +310,59 @@
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭妫�楠屾爣鍑嗗垹闄
+ public static ToMessage DeleteStepCheckStaned(string stanedcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TStepCheckRecord where checkstaned_code=@stanedcode";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠妫�楠屾爣鍑嗗凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+ //鍒犻櫎宸ュ簭妫�楠屾爣鍑嗕富琛�
+ sql = @"delete TStepCheckStandard where code=@stanedcode";
+ list.Add(new { str = sql, parm = new { stanedcode = stanedcode } });
+ //鍒犻櫎宸ュ簭妫�楠屾爣鍑嗛」鐩瓙琛�
+ sql = @"delete TStepCheckStandardSub where stepstaned_code=@stanedcode";
+ list.Add(new { str = sql, parm = new { stanedcode = stanedcode } });
+
+ 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;
+ }
}
catch (Exception e)
{
@@ -347,11 +414,11 @@
if (opertype == "Update")
{
//鍒犻櫎宸ュ簭妫�楠屾爣鍑嗗瓙琛�
- sql = @"delete from TStepCheckStandard where stepstaned_code=@stepstaned_code";
+ sql = @"delete from TStepCheckStandard where code=@stepstaned_code";
list.Add(new { str = sql, parm = new { stepstaned_code = json.code} });
//淇敼宸ュ簭妫�楠屾爣鍑嗕富琛�
- sql = @"update TStepCheckStandard set name=@stepstaned_name,descr=@stepstaned_desc where stepstaned_code=@stepstaned_code";
- list.Add(new { str = sql, parm = new { stepstaned_name = json.code, stepstaned_desc=json.description } });
+ sql = @"update TStepCheckStandard set name=@stepstaned_name,descr=@stepstaned_desc where code=@stepstaned_code";
+ list.Add(new { str = sql, parm = new { stepstaned_code=json.code, stepstaned_name = json.name, stepstaned_desc=json.description } });
//鏂板宸ュ簭妫�楠屾爣鍑嗗瓙琛�
for (int i = 0; i < json.Data.Rows.Count; i++)
{
@@ -400,23 +467,25 @@
{
if (itemcode != "" && itemcode != null)
{
- search += "and code=@itemcode ";
+ search += "and A.code=@itemcode ";
dynamicParams.Add("@itemcode", itemcode);
}
if (itemname != "" && itemname != null)
{
- search += "and name like '%'+@itemname+'%' ";
+ search += "and A.name like '%'+@itemname+'%' ";
dynamicParams.Add("@itemname", itemname);
}
if (itemdescr != "" && itemdescr != null)
{
- search += "and descr like '%'+@itemdescr+'%' ";
+ search += "and A.descr like '%'+@itemdescr+'%' ";
dynamicParams.Add("@itemdescr", itemdescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TStepCheckItem where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -567,5 +636,8 @@
return mes;
}
#endregion
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3