From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/Tools/SeachEncode.cs | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index dce8c51..99e7f85 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -68,10 +68,10 @@
}
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- //dynamicParams.Add("@cunm2", cunm2);
- //dynamicParams.Add("@rightcode", rightcode);
- //list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ dynamicParams.Add("@cunm2", cunm2);
+ dynamicParams.Add("@rightcode", rightcode);
+ list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
@@ -117,10 +117,10 @@
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- //dynamicParams.Add("@cunm2", cunm2);
- //dynamicParams.Add("@rightcode", rightcode);
- //list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ dynamicParams.Add("@cunm2", cunm2);
+ dynamicParams.Add("@rightcode", rightcode);
+ list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
@@ -164,10 +164,10 @@
}
Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
- //sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
- //dynamicParams.Add("@cunm2", cunm2);
- //dynamicParams.Add("@rightcode", rightcode);
- //list.Add(new { str = sql, parm = dynamicParams });
+ sql = @"update T_CodeRules set value=@cunm2 where rightcode=@rightcode";
+ dynamicParams.Add("@cunm2", cunm2);
+ dynamicParams.Add("@rightcode", rightcode);
+ list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
@@ -229,9 +229,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -276,9 +278,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -321,9 +325,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -342,7 +348,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚缂栫爜澶辫触!";
+ mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�"+ rightcode + "銆戠殑缂栫爜瑙勫垯!";
mes.data = null;
}
}
@@ -356,7 +362,6 @@
return mes;
}
#endregion
-
#region [鏍规嵁瑙掕壊缂栫爜鏌ヨ鍔熻兘鑿滃崟]
/// <summary>
@@ -386,17 +391,18 @@
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "Y";
-
+ cmp.is_delete = "0";
}
else
{
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "N";
+ cmp.is_delete = "0";
}
cmp.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -412,10 +418,11 @@
cmp1.code = data2.Rows[i]["RIGHT_CODE"].ToString();
cmp1.name = data2.Rows[i]["RIGHT_NAME"].ToString();
cmp1.flag = data2.Rows[i]["FLAG"].ToString();
+ cmp1.is_delete= data2.Rows[i]["IS_DELETE"].ToString();
cmp.children.Add(cmp1);
cmp1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -431,6 +438,7 @@
cmp2.code = data3.Rows[j]["RIGHT_CODE"].ToString();
cmp2.name = data3.Rows[j]["RIGHT_NAME"].ToString();
cmp2.flag = data3.Rows[j]["FLAG"].ToString();
+ cmp2.is_delete= data3.Rows[j]["IS_DELETE"].ToString();
cmp1.children.Add(cmp2);
}
}
@@ -450,17 +458,18 @@
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "Y";
-
+ cmt.is_delete = "0";
}
else
{
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "N";
+ cmt.is_delete = "0";
}
cmt.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -476,10 +485,11 @@
cmt1.code = date2.Rows[i]["RIGHT_CODE"].ToString();
cmt1.name = date2.Rows[i]["RIGHT_NAME"].ToString();
cmt1.flag = date2.Rows[i]["FLAG"].ToString();
+ cmt1.is_delete= date2.Rows[i]["IS_DELETE"].ToString();
cmt.children.Add(cmt1);
cmt1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -495,6 +505,7 @@
cmt2.code = date3.Rows[j]["RIGHT_CODE"].ToString();
cmt2.name = date3.Rows[j]["RIGHT_NAME"].ToString();
cmt2.flag = date3.Rows[j]["FLAG"].ToString();
+ cmt2.is_delete= date3.Rows[j]["IS_DELETE"].ToString();
cmt1.children.Add(cmt2);
}
}
--
Gitblit v1.9.3