From 2264c47cff7ab5ce52d7c158ac0eb941e7b46506 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 31 八月 2022 23:50:53 +0800
Subject: [PATCH] 大岛测试bug修改
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 0d6b0f3..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 = "鏌ヨ鎴愬姛!";
@@ -1125,6 +1125,8 @@
public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
{
var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ var sql_1 = "";
try
{
if (operType == "Add")
@@ -1167,6 +1169,7 @@
}
if (operType == "Update")
{
+ list.Clear();
//濡傛灉褰撳墠宸ュ簭浣跨敤鐘舵�佷綅N(鏈惎鐢�),闇�鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲宸ヨ壓璺嚎琚紩鐢ㄧ殑宸ュ崟鏄惁鍏抽棴
if (enable == "N")
{
@@ -1184,18 +1187,31 @@
return mes;
}
}
+ //褰撳墠宸ュ簭绫诲瀷涓庡叧鑱斿伐浣滅珯涓殑绫诲瀷鏄惁鍖归厤,涓嶅尮閰嶅垯娓呴櫎鍏宠仈宸ヤ綔绔欐暟鎹紝鍚屾椂娓呯悊宸ュ簭鏍�(鍏宠仈宸ヤ綔绔欐爣璇嗗瓧娈典负N)
+ 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]["FLWTYPE"].ToString() != steptypecode)
+ {
+ //鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
+ sql_1 = @"delete TFlw_Rteqp where step_code=@stepcode";
+ list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+ //淇敼宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
+ sql_1 = @"update TStep set is_eqp='N' where stepcode=@stepcode";
+ list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+ }
+ }
- var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+
+ sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
lm_user=@username,lm_date=@CreateDate where id=@stepid";
- dynamicParams.Add("@stepid", stepid);
- dynamicParams.Add("@stepname", stepname);
- dynamicParams.Add("@steptypecode", steptypecode);
- dynamicParams.Add("@enable", enable);
- dynamicParams.Add("@description", description);
- dynamicParams.Add("@username", username);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
+ list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname= stepname, steptypecode = steptypecode, enable= enable, description = description, username= username, CreateDate= DateTime.Now.ToString() } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
{
mes.code = "200";
mes.count = 0;
--
Gitblit v1.9.3