From 6b8782c6810660751b40d284d40ea7a13656c5b7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 05 九月 2022 20:04:13 +0800
Subject: [PATCH] 设备点检记录功能、大岛车间综合看板接口变更、工单批量关闭查询，提交
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 5166223..fe78a8d 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -690,7 +690,7 @@
select distinct route_code from TMateriel_Route where materiel_code=@partcode and is_delete<>'1'
) B
on A.code=B.route_code
- where A.is_delete='0'";
+ where A.is_delete='0' and A.enable='Y'";
dynamicParams.Add("@partcode", partcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -805,7 +805,7 @@
{
if (routecode != "" && routecode != null)
{
- search += "and A.code like '%'+@partcode+'%' ";
+ search += "and A.code like '%'+@routecode+'%' ";
dynamicParams.Add("@routecode", routecode);
}
if (routename != "" && routename != null)
@@ -815,12 +815,12 @@
}
if (description != "" && description != null)
{
- search += "and A.description=@description ";
+ search += "and A.description like '%'+@description+'%' ";
dynamicParams.Add("@description", description);
}
if (createuser != "" && createuser != null)
{
- search += "and U.username=@createuser ";
+ search += "and U.username like '%'+@createuser+'%' ";
dynamicParams.Add("@createuser", createuser);
}
if (search == "")
@@ -1046,7 +1046,7 @@
try
{
//鑾峰彇宸ュ簭鏁版嵁
- sql = @"select stepcode,stepname from TStep where is_delete<>'1' ";
+ sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1188,12 +1188,14 @@
}
}
//褰撳墠宸ュ簭绫诲瀷涓庡叧鑱斿伐浣滅珯涓殑绫诲瀷鏄惁鍖归厤,涓嶅尮閰嶅垯娓呴櫎鍏宠仈宸ヤ綔绔欐暟鎹紝鍚屾椂娓呯悊宸ュ簭鏍�(鍏宠仈宸ヤ綔绔欐爣璇嗗瓧娈典负N)
- var sql_10 = @"select * from TFlw_Rteqp where step_code=@stepcode";
+ var sql_10 = @"select S.flwtype from TFlw_Rteqp A
+ inner join TStep S on A.step_code=S.stepcode
+ where A.step_code=@stepcode";
dynamicParams.Add("@stepcode", stepcode);
var data_10 = DapperHelper.selectdata(sql_10, dynamicParams);
if (data_10.Rows.Count > 0)
{
- if (data_10.Rows[0]["STYLE"].ToString() != "steptypecode")
+ if (data_10.Rows[0]["FLWTYPE"].ToString() != steptypecode)
{
//鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
sql_1 = @"delete TFlw_Rteqp where step_code=@stepcode";
--
Gitblit v1.9.3