From af7cef297da2ac1937dbcf437c3a91b00658f6c2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 三月 2023 10:47:39 +0800
Subject: [PATCH] 订单下达获取工单语句修改,手工创建工单获取单号接口

---
 VueWebApi/Tools/SeachEncode.cs |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index 4fb3855..6bcebdb 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -23,6 +23,7 @@
             int digit2, value2, digit3, digitdiff;
             bool stf;
             List<object> list = new List<object>();
+            List<string> listdt = new List<string>();
             var dynamicParams = new DynamicParameters();
             try
             {
@@ -74,9 +75,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
                                 {
@@ -121,9 +124,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
                                 {
@@ -166,9 +171,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
                                 {
@@ -222,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
                                 {
@@ -269,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
                                 {
@@ -314,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
                                 {
@@ -335,7 +348,7 @@
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚缂栫爜澶辫触!";
+                    mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�"+ rightcode + "銆戠殑缂栫爜瑙勫垯!";
                     mes.data = null;
                 }             
             }
@@ -379,17 +392,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
@@ -405,10 +419,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
@@ -424,6 +439,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);
                         }
                     }
@@ -443,17 +459,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
@@ -469,10 +486,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
@@ -488,6 +506,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