From ece3372b4f7500483092a90f2a1e40f3586f6f1b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 23 六月 2022 18:47:14 +0800
Subject: [PATCH] 存货档案、工艺路线(新增、编辑、删除、关联工艺路线)

---
 VueWebApi/DLL/DAL/BasicSettingDAL.cs |  411 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 311 insertions(+), 100 deletions(-)

diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 26a34c9..49a4858 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -75,7 +75,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -134,7 +136,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -160,12 +164,16 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
                 if (operType == "Update")
@@ -181,19 +189,25 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -223,19 +237,25 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -294,7 +314,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -330,7 +352,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.data = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -386,12 +410,16 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
                 if (OperType == "Update")
@@ -411,19 +439,25 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -442,29 +476,33 @@
                 dynamicParams.Add("@userid", userid);
                 var data = DapperHelper.selectdata(sql, dynamicParams);
 
-                sql = @"update TUserRoleRelation set is_delete='1'  where user_code=@usercode";
-                dynamicParams.Add("@usercode", data.Rows[0]["USERCODE"].ToString());
-                list.Add(new { str = sql, parm = dynamicParams });
+                sql = @"delete TUserRoleRelation  where user_code=@usercode";
+                list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
 
                 sql = @"update TUser set is_delete='1'  where id=@userid";
-                dynamicParams.Add("@userid", userid);
-                list.Add(new { str = sql, parm = dynamicParams });
+                list.Add(new { str = sql, parm = new { userid = userid } });
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -507,7 +545,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -518,7 +558,6 @@
         {
             var sql = "";
             List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
             try
             {
                 list.Clear();
@@ -526,52 +565,53 @@
                 {
                     //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
                     sql = @"delete TUserRoleRelation where user_code=@usercode";
-                    dynamicParams.Add("@usercode", usercode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm =new {usercode = usercode } });
                     //娓呴櫎鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
-                    sql = @"update TUser set is_role='N' where user_code=@usercode";
-                    dynamicParams.Add("@usercode", usercode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    sql = @"update TUser set is_role='N' where usercode=@usercode";
+                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                 }
                 else
                 {
                     //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
                     sql = @"delete TUserRoleRelation where user_code=@usercode";
-                    dynamicParams.Add("@usercode", usercode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { usercode = usercode } });
+                    
                     //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
                     for (int i = 0; i < json.Count; i++)
                     {
                         for (int j = 0; j < json[i].Data.Count; j++)
                         {
-                            sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
-                            dynamicParams.Add("@usercode", usercode);
-                            dynamicParams.Add("@role_code", json[i].Data[j]);
-                            list.Add(new { str = sql, parm = dynamicParams });
+                            sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
+                            list.Add(new { str = sql, parm = new { usercode = usercode, role_code= json[i].Data[j] } });
 
                         }
                     }
                     //鏍囪鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
-                    sql = @"update TUser set is_role='Y' where user_code=@usercode";
-                    dynamicParams.Add("@usercode", usercode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    sql = @"update TUser set is_role='Y' where usercode=@usercode";
+                    list.Add(new { str = sql, parm = new { usercode = usercode} });
                 }
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -583,7 +623,6 @@
             var sql = "";
             List<object> list = new List<object>();
             DataTable ds = new DataTable();
-            var dynamicParams = new DynamicParameters();
 
             try
             {
@@ -592,7 +631,9 @@
                 if (rowsnum == 0)
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "Excel琛ㄦ牸涓虹┖,鏃犳暟鎹紒";
+                    mes.data = null;
                 }
                 else
                 {
@@ -604,36 +645,44 @@
                         {
                             sql = @"insert into TUser(usercode,username,enable,password,mobile,email,lm_user,lm_date,wagetype,stu_torgcode)
                                     values(@usercode,@username,@enable,@password,@mobile,@email,@lm_user,@lm_date,@wagetype,@stu_torgcode)";
-                            dynamicParams.Add("@usercode", ds.Rows[i][1].ToString());
-                            dynamicParams.Add("@username", ds.Rows[i][2].ToString());
-                            dynamicParams.Add("@enable", ds.Rows[i][3].ToString());
-                            dynamicParams.Add("@password", ds.Rows[i][4].ToString());
-                            dynamicParams.Add("@mobile", ds.Rows[i][5].ToString());
-                            dynamicParams.Add("@email", ds.Rows[i][6].ToString());
-                            dynamicParams.Add("@lm_user", username);
-                            dynamicParams.Add("@lm_date", DateTime.Now.ToString());
-                            dynamicParams.Add("@wagetype", ds.Rows[i][7].ToString());
-                            dynamicParams.Add("@stu_torgcode", ds.Rows[i][8].ToString());
-                            list.Add(new { str = sql, parm = dynamicParams });
+                            list.Add(new { str = sql, parm = new {
+                                usercode = ds.Rows[i][1].ToString(),
+                                username = ds.Rows[i][2].ToString(),
+                                enable = ds.Rows[i][3].ToString(),
+                                password = ds.Rows[i][4].ToString(),
+                                mobile = ds.Rows[i][5].ToString(),
+                                email = ds.Rows[i][6].ToString(),
+                                lm_user = username,
+                                lm_date = DateTime.Now.ToString(),
+                                wagetype = ds.Rows[i][7].ToString(),
+                                stu_torgcode = ds.Rows[i][8].ToString()
+                            } 
+                            });
                         }
                     }
                     bool aa = DapperHelper.DoTransaction(list);
                     if (aa)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "瀵煎叆鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "瀵煎叆澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -651,7 +700,7 @@
                 var total = 0; //鎬绘潯鏁�
                 var sql = @"select roletype_code,roletype_name 
                             from TRoleType 
-                            where  A.is_delete<>'1' ";
+                            where  is_delete<>'1' ";
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
                 mes.Message = "鏌ヨ鎴愬姛!";
@@ -661,7 +710,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -679,27 +730,39 @@
                 //寰幆鍐欏叆瑙掕壊绫诲瀷琛�
                 for (int i = 0; i < json.Count; i++)
                 {
-                    sql = @"insert into TRoleType(roletypecode,roletypename) values(@roletypecode,@roletypename)";
-                    dynamicParams.Add("@roletypecode", json[i].code);
-                    dynamicParams.Add("@roletypename", json[i].name);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            roletypecode = json[i].code,
+                            roletypename = json[i].name
+                        }
+                    });
                 }
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -710,33 +773,59 @@
         {
             var sql = "";
             List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
             try
             {
                 list.Clear();
                 sql = @"delete TRoleType where roletype_code=@roletypecode";
-                dynamicParams.Add("@roletypecode", roleTypeCode);
-                list.Add(new { str = sql, parm = dynamicParams });
+                list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode}});
                 sql = @"delete TRole where roletype_code=@roletypecode";
-                dynamicParams.Add("@roletypecode", roleTypeCode);
-                list.Add(new { str = sql, parm = dynamicParams });
-
+                list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode }});
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
+        public static ToMessage RoleTypeSelect()
+        {
+            string sql = "";
+            try
+            {
+                //鑾峰彇璁惧绫诲瀷鏁版嵁
+                sql = @"select roletype_code,roletype_name from TRoleType where is_delete<>'1' ";
+                var data = DapperHelper.selecttable(sql);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -776,7 +865,7 @@
                 //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
-                var sql = @"select A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.lm_user,A.lm_date,A.is_user,A.is_right  
+                var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,A.lm_user,A.lm_date,A.is_user,A.is_right  
                             from TRole A
                             left join TRoleType  B on A.roletype_code=B.roletype_code
                             where  A.is_delete<>'1' " + search;
@@ -789,7 +878,9 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -815,17 +906,21 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
                 if (OperType == "Update")
                 {
-                    var sql = @"update TRole set role_name=@UserName,Usercode=@Usercode,CreateDate=@CreateDate,RoleTypeCode=@RoleTypeCode,description=@description where id=@RoleId";
+                    var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
                     dynamicParams.Add("@RoleId", RoleId);
                     dynamicParams.Add("@RoleName", RoleName);
                     dynamicParams.Add("@Usercode", Usercode);
@@ -836,19 +931,25 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -859,40 +960,39 @@
         {
             var sql = "";
             List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
             try
             {
                 //鏇存柊瑙掕壊琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
                 sql = @"update TRole set is_user='N',is_right='N',is_delete='1'  where role_code=@RoleCode";
-                dynamicParams.Add("@RoleCode", RoleCode);
-                list.Add(new { str = sql, parm = dynamicParams });
-
+                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                 //鏇存柊瑙掕壊鍏宠仈鐢ㄦ埛琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
-                sql = @"update TUserRoleRelation set is_delete='1'  where role_code=@RoleCode";
-                dynamicParams.Add("@RoleCode", RoleCode);
-                list.Add(new { str = sql, parm = dynamicParams });
-
+                sql = @"delete TUserRoleRelation  where role_code=@RoleCode";
+                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                 //鍒犻櫎(鏇存柊鐘舵��)瑙掕壊鍔熻兘琛�
-                sql = @"update TRoleRightRelation set is_delete='1'  where user_code=@RoleCode";
-                dynamicParams.Add("@RoleCode", RoleCode);
-                list.Add(new { str = sql, parm = dynamicParams });
-
+                sql = @"update TRoleRightRelation set is_delete='1'  where role_code=@RoleCode";
+                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -907,12 +1007,12 @@
             {
                 if (usercode != "" && usercode != null)
                 {
-                    search += "and A.usercode like '%'+@RoleCode+'%' ";
+                    search += "and A.usercode like '%'+@usercode+'%' ";
                     dynamicParams.Add("@usercode", usercode);
                 }
                 if (username != "" && username != null)
                 {
-                    search += "and A.username like '%'+@RoleName+'%' ";
+                    search += "and A.username like '%'+@username+'%' ";
                     dynamicParams.Add("@username", username);
                 }
                 if (orgcode != "" && orgcode != null)
@@ -933,7 +1033,7 @@
                 }
                 if (search == "")
                 {
-                    search = "and 1=1 ";
+                    search = " and 1=1 ";
                 }
                 //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -943,7 +1043,8 @@
                              left join TOrganization B on A.stu_torgcode=B.org_code
                              left join (
                                 select distinct user_code  from TUserRoleRelation where role_code=@rolecode
-                             ) C on A.usercode=C.user_code" + search;
+                             ) C on A.usercode=C.user_code where A.is_delete<>'1' " + search;
+                dynamicParams.Add("@rolecode", rolecode);
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
                 mes.Message = "鏌ヨ鎴愬姛!";
@@ -953,18 +1054,46 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ1]
+        public static ToMessage RoleAssociationUserTwo(string rolecode)
+        {
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            List<TreeObejct> list = new List<TreeObejct>();
+            try
+            {
+                //鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
+                dynamicParams.Add("@role_code", rolecode);
+                var data = DapperHelper.selectProcedure("h_p_T_RoleAssociationUserDisplay", dynamicParams);
+                
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
         #endregion
 
         #region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛淇濆瓨]
-        public static ToMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
+        public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
         {
             var sql = "";
             List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
             try
             {
                 list.Clear();
@@ -972,48 +1101,48 @@
                 {
                     //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
                     sql = @"delete TUserRoleRelation where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                     //鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
                     sql = @"update TRole set is_user='N' where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                 }
                 else
                 {
                     //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
                     sql = @"delete TUserRoleRelation where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                     //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
                     for (int i = 0; i < json.Count; i++)
                     {
-                        sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
-                        dynamicParams.Add("@usercode", json[i]);
-                        dynamicParams.Add("@role_code", rolecode);
-                        list.Add(new { str = sql, parm = dynamicParams });
+                        sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
+                        list.Add(new { str = sql, parm = new { usercode = json[i].code, role_code = rolecode } });
                     }
                     //鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
                     sql = @"update TRole set is_user='Y' where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                 }
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -1022,8 +1151,6 @@
         #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
         public static ToMessage RoleAssociationRight(string rolecode,string type)
         {
-
-            Dictionary<object, object> dList = new Dictionary<object, object>();
             List<object> list=new List<object>();
             try
             {
@@ -1040,13 +1167,16 @@
                     list.Add(SeachEncode.RightLocation(rolecode, type));
                 }
                 mes.code = "200";
+                mes.count = list.Count;
                 mes.Message = "鏌ヨ鎴愬姛!";
                 mes.data = list;
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -1057,7 +1187,6 @@
         {
             var sql = "";
             List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
             try
             {
                 list.Clear();
@@ -1065,19 +1194,16 @@
                 {
                     //娓呴櫎鐢ㄦ埛鍏宠仈鍔熻兘琛ㄦ暟鎹�
                     sql = @"delete TRoleRightRelation where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                     //鏍囪瑙掕壊琛ㄥ叧鑱斿姛鑳芥爣璇�
                     sql = @"update TRole set is_right='N' where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                 }
                 else
                 {
                     //娓呴櫎瑙掕壊鍏宠仈鍔熻兘琛ㄦ暟鎹�
                     sql = @"delete TRoleRightRelation where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                     //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
                     for (int i = 0; i < json.Count; i++)  //PC銆丄PP灞�
                     {
@@ -1086,35 +1212,41 @@
                             for (int k = 0; k < json[i].children[j].children.Count; k++) //浜岀骇鑿滃崟
                             {
                                 sql = @"insert into TRoleRightRelation(role_code,right_code,lm_user,lm_date) values(@role_code,@right_code,@lm_user,@lm_date)";
-                                dynamicParams.Add("@role_code", rolecode);
-                                dynamicParams.Add("@right_code", json[i].children[j].children[k].code);
-                                dynamicParams.Add("@lm_user", usercode);
-                                dynamicParams.Add("@lm_date", DateTime.Now.ToString());
-                                list.Add(new { str = sql, parm = dynamicParams });
+                                list.Add(new { str = sql, parm = new { 
+                                    role_code = rolecode, 
+                                    right_code= json[i].children[j].children[k].code, 
+                                    lm_user= usercode, lm_date= DateTime.Now.ToString() 
+                                } 
+                                });
                             }
                         }
                     }
                     //鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
                     sql = @"update TRole set is_right='Y' where role_code=@rolecode";
-                    dynamicParams.Add("@rolecode", rolecode);
-                    list.Add(new { str = sql, parm = dynamicParams });
+                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                 }
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     mes.code = "200";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
+                    mes.count = 0;
                     mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
@@ -1140,8 +1272,21 @@
                 }
                 if (unitAttr != "" && unitAttr != null)
                 {
-                    search += "and unitattribute=@unitAttr ";
-                    dynamicParams.Add("@unitAttr", unitAttr);
+                    switch (unitAttr)
+                    {
+                        case "WG":  //澶栬喘
+                            search += "and mtype=@unitAttr ";
+                            dynamicParams.Add("@unitAttr", unitAttr);
+                            break;
+                        case "WX":  //澶栧崗
+                            search += "and btype=@unitAttr ";
+                            dynamicParams.Add("@unitAttr", unitAttr);
+                            break;
+                        default:    //瀹㈡埛
+                            search += "and htype=@unitAttr ";
+                            dynamicParams.Add("@unitAttr", unitAttr);
+                            break;
+                    }
                 }
                 if (createUser != "" && createUser != null)
                 {
@@ -1154,7 +1299,7 @@
                 }
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
-                var sql = @"select id,code,name,unitattribute,conttacts,addr,lm_user,lm_date from TCustomer
+                var sql = @"select id,code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date from TCustomer
                             where  is_delete<>'1' " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";
@@ -1165,25 +1310,29 @@
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }
         #endregion
 
         #region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
-        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string unitattr, string person, string contact, string description, string usercode,string OperType)
+        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string mtypecode, string btypecode, string htypecode, string person, string contact, string description, string usercode,string OperType)
         {
             var dynamicParams = new DynamicParameters();
             try
             {
                 if (OperType == "Add")
                 {
-                    var sql = @"insert into TCustomer(code,name,unitattribute,conttacts,conttphone,addr,lm_user,lm_date) 
-                            values(@unitcode,@unitname,@unitattr,@person,@contact,@description,@usercode,@CreateDate)";
+                    var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date) 
+                            values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
                     dynamicParams.Add("@unitcode", unitcode);
                     dynamicParams.Add("@unitname", unitname);
-                    dynamicParams.Add("@unitattr", unitattr);
+                    dynamicParams.Add("@mtypecode", mtypecode);
+                    dynamicParams.Add("@btypecode", btypecode);
+                    dynamicParams.Add("@htypecode", htypecode);
                     dynamicParams.Add("@person", person);
                     dynamicParams.Add("@contact", contact);
                     dynamicParams.Add("@description", description);
@@ -1193,20 +1342,26 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "鏂板鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
                 if (OperType == "Update")
                 {
-                    var sql = @"update TCustomer set name=@unitname,unitattribute=@unitattr,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@RoleId";
+                    var sql = @"update TCustomer set name=@unitname,mtype=@mtypecode,btype=@btypecode,htype=@htypecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
                     dynamicParams.Add("@unitid", unitid);
                     dynamicParams.Add("@unitname", unitname);
-                    dynamicParams.Add("@unitattr", unitattr);
+                    dynamicParams.Add("@mtypecode", mtypecode);
+                    dynamicParams.Add("@btypecode", btypecode);
+                    dynamicParams.Add("@htypecode", htypecode);
                     dynamicParams.Add("@person", person);
                     dynamicParams.Add("@contact", contact);
                     dynamicParams.Add("@description", description);
@@ -1216,19 +1371,75 @@
                     if (cont > 0)
                     {
                         mes.code = "200";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+                        mes.data = null;
                     }
                     else
                     {
                         mes.code = "300";
+                        mes.count = 0;
                         mes.Message = "淇敼鎿嶄綔澶辫触!";
+                        mes.data = null;
                     }
                 }
             }
             catch (Exception e)
             {
                 mes.code = "300";
+                mes.count = 0;
                 mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[寰�鏉ュ崟浣嶅垹闄
+        public static ToMessage DeleteCurrentUnit(string unitcode)
+        {
+            var sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                sql = @"select *  from TFlw_Rteqp where eqp_code=@unitcode";
+                dynamicParams.Add("@unitcode", unitcode);
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                if (data.Rows.Count > 0)
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "澶栧崗渚涙柟宸插叧鑱斿鍗忓伐搴�,涓嶅厑璁稿垹闄�!";
+                    mes.data = null;
+                    return mes;
+                }
+                //鍒犻櫎(鏇存柊鐘舵��)寰�鏉ュ崟浣嶈〃
+                sql = @"update TCustomer set is_delete='1'  where code=@unitcode";
+                list.Add(new { str = sql, parm = new { unitcode = unitcode } });
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    mes.code = "200";
+                    mes.count = 0;
+                    mes.Message = "鍒犻櫎鎴愬姛!";
+                    mes.data = null;
+                }
+                else
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "鍒犻櫎澶辫触!";
+                    mes.data = null;
+                }
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
             }
             return mes;
         }

--
Gitblit v1.9.3