From dac60fce253e085b3c4f4ee049a795f16aed2eba Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 08 五月 2023 18:15:39 +0800
Subject: [PATCH] 物流检验记录接口修改 末道工序完工报工自动关单方法开发 登录登出记录接口修改(去掉update,保留insert)
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 5dac0f0..788f8bc 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -686,13 +686,8 @@
search += "and A.check_result=@checkresult ";
dynamicParams.Add("@checkresult", checkresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
+ var total = 0; //鎬绘潯鏁�(棣栨銆佸贰妫�銆佸畬宸ユ楠�)
var sql = @"select A.id,A.wo_code,A.partcode,B.partname,B.partspec,A.step_code,S.stepname,A.checkstaned_code,T.name as checkstaned_name,A.check_user,
A.check_type,A.check_result,A.check_descr,A.check_qty,U.username as lm_user,A.lm_date
from TStepCheckRecord A
@@ -700,7 +695,7 @@
left join TStep S on A.step_code=S.stepcode
left join TStepCheckStandard T on A.checkstaned_code=T.code
left join TUser U on A.check_user=U.usercode
- where " + search;
+ where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -794,11 +789,6 @@
search += "and A.check_result=@checkresult ";
dynamicParams.Add("@checkresult", checkresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select
@@ -848,7 +838,7 @@
left join TStep S on A.step_code=S.stepcode
left join TStepCheckStandard T on A.checkstaned_code=T.code
left join TUser U on A.check_user=U.usercode
- where " + search;
+ where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
--
Gitblit v1.9.3