From c42507edbe94f0c71044cf7c69d1b5698d194217 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 31 十月 2024 09:40:34 +0800
Subject: [PATCH] 增加设备工艺参数点检表查询方法,

---
 WebAPI/Controllers/BLL/Xt_UserController.cs | 2053 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 1,993 insertions(+), 60 deletions(-)

diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 51c5995..9920cb7 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -1,6 +1,7 @@
 锘縰sing Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Pub_Class;
+using SyntacticSugar.constant;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -107,6 +108,26 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+
+                //鑾峰彇褰撳墠鐢ㄦ埛韬唤鍒楄〃
+                string sql = "select HLev from System_UserGroupInfo u " +
+                        " left join System_UserGroup r " +
+                        "on u.GroupId = r.GroupID where u.UserId = '" + HCzybm + "'";
+
+                //鐢ㄦ埛韬唤鍒ゆ柇
+                DataSet hLev = oCN.RunProcReturn(sql, "System_UserGroupInfo");
+                foreach(DataRow dr in hLev.Tables[0].Rows)
+                {
+                    if (!dr["HLev"].Equals(RoleConstant.EMPLOYEE))
+                    {
+                        objJsonResult.code = CodeConstant.FAIL;
+                        objJsonResult.count = CountConstant.FAIL;
+                        objJsonResult.Message = "绠$悊鍛樿韩浠戒笉鍏佽鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }      
+
                 oCN.BeginTran();
                 //鍒犻櫎鐢ㄦ埛淇℃伅
                 oCN.RunProc("delete from  Gy_Czygl where Czybm='" + HCzybm + "'");
@@ -206,14 +227,14 @@
                     ",HWhID,HWHName,HSupID,HSupName " +
                     ",HSCWHID,HSCWHName " +
                     ",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
-                    ",HGroupID,HSourceID) " +
+                    ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID) " +
                     "values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
                     ","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
                     "," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
                     "," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
                     "," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" + 
                     ",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
-                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + ")");
+                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "','" + lsmain[0].HDingDingUserID + "'" + ")");
 
                     //鏂板鍚庢煡璇�  纭繚鏁版嵁娣诲姞鎴愬姛
                     ds = oCN.RunProcReturn("Select * from  Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -256,6 +277,7 @@
                         ",HDeptID=" + lsmain[0].HDeptID.ToString() +
                         ",HDept='" + lsmain[0].HDept.ToString() + "'" +
                         ",HWhID=" + lsmain[0].HWhID.ToString() +
+                        ",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
                         ",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
                         ",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
                         ",HSCWHName='" + lsmain[0].HSCWHName.ToString() + "'" +
@@ -263,10 +285,13 @@
                         ",HProcID=" + lsmain[0].HProcID.ToString() +
                         ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                         ",HGroupID=" + lsmain[0].HGroupID.ToString() +
+                        ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                         ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                         ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                         ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                         ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+                        ",HICNumber='" + lsmain[0].HICNumber + "'" +
+                        ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
                         "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                     }
                     else
@@ -283,6 +308,7 @@
                            ",HSellMan='" + lsmain[0].HSellMan.ToString() + "'" +
                            ",HDeptID=" + lsmain[0].HDeptID.ToString() +
                            ",HDept='" + lsmain[0].HDept.ToString() + "'" +
+                           ",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
                            ",HWhID=" + lsmain[0].HWhID.ToString() +
                            ",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
                            ",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
@@ -291,10 +317,13 @@
                             ",HProcID=" + lsmain[0].HProcID.ToString() +
                            ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                            ",HGroupID=" + lsmain[0].HGroupID.ToString() +
+                           ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                            ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                            ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                            ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                            ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+                           ",HICNumber='" + lsmain[0].HICNumber + "'" +
+                           ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
                            "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                     }
 
@@ -681,7 +710,7 @@
                 return objJsonResult;
             }
         }
-        #endregion
+        #endregion       
 
         #region 鐢ㄦ埛鍏宠仈缁勭粐淇濆瓨
         [Route("Xt_User/SaveUserByOrg")]
@@ -728,6 +757,316 @@
         }
         #endregion
 
+        #region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢鍒楄〃
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationOrganizationList")]
+        [HttpGet]
+        public object UserRelationOrganizationList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Query", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserOrganizationRelationList_Query order by 鐢ㄦ埛浠g爜 asc,缁勭粐浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserOrganizationRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,缁勭粐浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationOrganizationlist_Drop")]
+        [HttpGet]
+        public object UserRelationOrganizationlist_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Drop", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserORGRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 缂栬緫鍒濆鍖�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationOrganizationList_EditInit")]
+        [HttpGet]
+        public object UserRelationOrganizationList_EditInit(int HItemID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Query", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                string sql = "select * from h_v_Gy_UserOrganizationRelationList_Query where HItemID = " + HItemID;
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 淇濆瓨
+        [Route("Xt_User/UserRelationOrganizationList_Save")]
+        [HttpPost]
+        public object UserRelationOrganizationList_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string user = sArray[1].ToString();
+            string saveType = sArray[2].ToString();
+            try
+            {
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Edit", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+                foreach (JObject item in Excel)
+                {
+                    Dictionary<string, string> dic = new Dictionary<string, string>();
+                    foreach (var itm in item.Properties())
+                    {
+                        dic.Add(itm.Name, itm.Value.ToString());
+                    }
+                    list.Add(dic);
+                }
+
+                if (saveType == "1")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HOrgID = item["HOrgID"].ToString();          //缁勭粐鍐呯爜
+                        string HOrgNumber = item["HOrgNumber"].ToString();  //缁勭粐浠g爜
+                        string HOrgName = item["HOrgName"].ToString();      //缁勭粐鍚嶇О
+
+
+                        sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
+                        if (ds.Tables[0].Rows.Count == 0)
+                        {
+                            sql = "insert into Gy_UserORGRelation(HUserID,HOrgID)" +
+                                "values(" +
+                                "'" + HUserID + "'" +
+                                "," + HOrgID + "" +
+                                ")";
+                            oCN.RunProc(sql);
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旂粍缁囥��" + HOrgName + "銆�";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if (saveType == "3")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HOrgID = item["HOrgID"].ToString();          //缁勭粐鍐呯爜
+                        string HOrgNumber = item["HOrgNumber"].ToString();  //缁勭粐浠g爜
+                        string HOrgName = item["HOrgName"].ToString();      //缁勭粐鍚嶇О
+
+                        sql = "select * from Gy_UserORGRelation where HItemID = " + HItemID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
+                        if (ds.Tables[0].Rows.Count > 0)
+                        {
+                            sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID + " and HItemID <> " + HItemID;
+                            ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
+                            if (ds.Tables[0].Rows.Count == 0)
+                            {
+                                sql = "update Gy_UserORGRelation set " +
+                                      "HUserID = '" + HUserID + "' " +
+                                      ",HOrgID = " + HOrgID + " " +
+                                      "where HItemID = " + HItemID;
+                                oCN.RunProc(sql);
+                            }
+                            else
+                            {
+                                err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旂粍缁囥��" + HOrgName + "銆�";
+                            }
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細璁板綍涓嶅瓨鍦�!";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛!";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                LogService.Write(e);
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region  鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶄粨搴撳垪琛�
         [Route("Xt_User/UserStocklistPlaylist")]
         [HttpGet]
@@ -753,6 +1092,110 @@
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region  鐢ㄦ埛鍏宠仈浠撳簱鍒楄〃鏌ヨ
+        [Route("Xt_User/Gy_UserStockRelationList")]
+        [HttpGet]
+        public object Gy_UserStockRelationList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserStockRelation_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql1 = "select * from h_v_Gy_UserStockRelation where 1 = 1";
+                string sql = sql1 + sWhere + " order by 鐢ㄦ埛浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserStockRelation");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈浠撳簱鍒楄〃 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/Gy_UserStockRelationDrop")]
+        [HttpGet]
+        public object Gy_UserStockRelationDrop(string HItemID, string user)
+        {
+            try
+            {
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserStockRelation_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HItemID == null || HItemID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserStockRelation where HItemID = " + HItemID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
             }
             catch (Exception e)
             {
@@ -810,6 +1253,45 @@
         }
         #endregion
 
+        #region  鐢ㄦ埛鍏宠仈鐢ㄦ埛鍒楄〃鏌ヨ
+        [Route("Xt_User/Gy_UserByUserList")]
+        [HttpGet]
+        public object Gy_UserByUserList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                string sql1 = "select * from h_v_Gy_UserByUserRelationList where 1 = 1";
+                string sql = sql1 + sWhere + " order by 鐢ㄦ埛浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserStockRelation");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region  鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶇彮缁勫垪琛�
         [Route("Xt_User/UserGrouplistPlaylist")]
         [HttpGet]
@@ -835,6 +1317,69 @@
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈鐝粍缁存姢鍒楄〃
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/Gy_UserGroupRelationList")]
+        [HttpGet]
+        public object Gy_UserGroupRelationList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserGroupRelationList_Query order by 鐢ㄦ埛浠g爜 asc,鐝粍浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserGroupRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserGroupRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,鐝粍浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserGroupRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
             }
             catch (Exception e)
             {
@@ -887,6 +1432,62 @@
                 objJsonResult.count = 0;
                 objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
                 objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈鐝粍缁存姢 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserGroupRelationList_Drop")]
+        [HttpGet]
+        public object UserGroupRelationList_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Delete", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserGroupRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
@@ -969,6 +1570,168 @@
                 objJsonResult.count = 0;
                 objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
                 objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈閮ㄩ棬鏌ヨ
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationDeptlist")]
+        [HttpGet]
+        public object UserRelationDeptlist(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserDeptRelationList_Query order by 鐢ㄦ埛浠g爜 asc,閮ㄩ棬浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserDeptRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,閮ㄩ棬浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈閮ㄩ棬 鏍规嵁鐢ㄦ埛ID鏌ユ壘
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationDeptlist_EditInit")]
+        [HttpGet]
+        public object UserRelationDeptlist_EditInit(int HItemID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "select * from h_v_Gy_UserDeptRelationList_Query where HItemID = " + HItemID;
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈閮ㄩ棬 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationDeptlist_Drop")]
+        [HttpGet]
+        public object UserRelationDeptlist_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserDeptRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
@@ -1093,6 +1856,69 @@
         }
         #endregion
 
+        #region 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢鍒楄〃
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserByWorkStationRelationList")]
+        [HttpGet]
+        public object UserByWorkStationRelationList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserByWorkStationRelationList_Query order by 鐢ㄦ埛浠g爜 asc,宸ヤ綅浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserByWorkStationRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,宸ヤ綅浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region 鐢ㄦ埛鍏宠仈宸ヤ綅淇濆瓨
         [Route("Xt_User/SaveUserByWorkStation")]
         [HttpPost]
@@ -1133,6 +1959,105 @@
                 objJsonResult.count = 0;
                 objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
                 objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢 缂栬緫鍒濆鍖�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserByWorkStationRelationList_EditInit")]
+        [HttpGet]
+        public object UserByWorkStationRelationList_EditInit(int HItemID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "select * from h_v_Gy_UserByWorkStationRelationList_Query where 鐢ㄦ埛浠g爜 = '" + HItemID + "'";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_Query");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserByWorkStationRelationList_Drop")]
+        [HttpGet]
+        public object UserByWorkStationRelationList_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserByWorkStationRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
@@ -1457,6 +2382,316 @@
         }
         #endregion
 
+        #region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢鍒楄〃
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationEmployeelist")]
+        [HttpGet]
+        public object UserRelationEmployeelist(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_Query", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserEmployeeRelationList_Query order by 鐢ㄦ埛浠g爜 asc,鑱屽憳浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserEmployeeRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,鑱屽憳浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationEmployeelist_Drop")]
+        [HttpGet]
+        public object UserRelationEmployeelist_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_Drop", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserEmployeeRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 缂栬緫鍒濆鍖�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationEmployeelist_EditInit")]
+        [HttpGet]
+        public object UserRelationEmployeelist_EditInit(int HItemID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_Query", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                string sql = "select * from h_v_Gy_UserEmployeeRelationList_Query where HItemID = " + HItemID;
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_Query");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 淇濆瓨
+        [Route("Xt_User/UserRelationEmployeelist_Save")]
+        [HttpPost]
+        public object UserRelationEmployeelist_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string user = sArray[1].ToString();
+            string saveType = sArray[2].ToString();
+            try
+            {
+                //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_Edit", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+                foreach (JObject item in Excel)
+                {
+                    Dictionary<string, string> dic = new Dictionary<string, string>();
+                    foreach (var itm in item.Properties())
+                    {
+                        dic.Add(itm.Name, itm.Value.ToString());
+                    }
+                    list.Add(dic);
+                }
+
+                if (saveType == "1")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HEmpID = item["HEmpID"].ToString();          //瀹㈡埛鍐呯爜
+                        string HEmpNumber = item["HEmpNumber"].ToString();  //瀹㈡埛浠g爜
+                        string HEmpName = item["HEmpName"].ToString();      //瀹㈡埛鍚嶇О
+
+
+                        sql = "select * from Gy_UserEmployeeRelation where HUserID = '" + HUserID + "' and HEmployeeID = " + HEmpID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+                        if (ds.Tables[0].Rows.Count == 0)
+                        {
+                            sql = "insert into Gy_UserEmployeeRelation(HUserID,HEmployeeID)" +
+                                "values(" +
+                                "'" + HUserID + "'" +
+                                "," + HEmpID + "" +
+                                ")";
+                            oCN.RunProc(sql);
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旇亴鍛樸��" + HEmpName + "銆�";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if (saveType == "3")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HEmpID = item["HEmpID"].ToString();          //鑱屽憳鍐呯爜
+                        string HEmpNumber = item["HEmpNumber"].ToString();  //鑱屽憳浠g爜
+                        string HEmpName = item["HEmpName"].ToString();      //鑱屽憳鍚嶇О
+
+                        sql = "select * from Gy_UserEmployeeRelation where HItemID = " + HItemID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+                        if (ds.Tables[0].Rows.Count > 0)
+                        {
+                            sql = "select * from Gy_UserEmployeeRelation where HUserID = '" + HUserID + "' and HEmployeeID = " + HEmpID + " and HItemID <> " + HItemID;
+                            ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+                            if (ds.Tables[0].Rows.Count == 0)
+                            {
+                                sql = "update Gy_UserEmployeeRelation set " +
+                                      "HUserID = '" + HUserID + "' " +
+                                      ",HEmployeeID = " + HEmpID + " " +
+                                      "where HItemID = " + HItemID;
+                                oCN.RunProc(sql);
+                            }
+                            else
+                            {
+                                err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旇亴鍛樸��" + HEmpName + "銆�";
+                            }
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細璁板綍涓嶅瓨鍦�!";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛!";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                LogService.Write(e);
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region  鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶇敤鎴峰垪琛�
         [Route("Xt_User/UserPlaylist")]
         [HttpGet]
@@ -1565,6 +2800,109 @@
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region  鐢ㄦ埛鍏宠仈鐗╂枡鍒楄〃鏌ヨ
+        [Route("Xt_User/Gy_UserMaterList")]
+        [HttpGet]
+        public object Gy_UserMaterList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserMaterList_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql1 = "select * from h_v_Gy_UserMater where 1 = 1";
+                string sql = sql1 + sWhere + " order by 鐢ㄦ埛浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserMater");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈鐗╂枡鍒楄〃 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/Gy_UserMaterRelationDrop")]
+        [HttpGet]
+        public object Gy_UserMaterRelationDrop(string HItemID, string user)
+        {
+            try
+            {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserMaterList_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HItemID == null || HItemID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserMaterRelation where HItemID = " + HItemID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
             }
             catch (Exception e)
             {
@@ -1720,6 +3058,63 @@
             }
         }
         #endregion
+        #region 鐢ㄦ埛鍏宠仈瀹㈡埛淇濆瓨
+        [Route("Xt_User/SaveUserCustomer")]
+        [HttpPost]
+        public object SaveUserCustomer([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString();
+            string msg4 = sArray[2].ToString();
+
+            //鏌ヨ鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log_second("Gy_UserRelationCustomer_Edit", 1, false, msg4))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犵紪杈戞潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+            ListModels oListModels = new ListModels();
+            try
+            {
+                List<Models.Gy_UserCustomer> lsmain = new List<Models.Gy_UserCustomer>();
+                msg2 = msg2.Substring(1, msg2.Length - 2);
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_Gy_UserCustomer(msg2);
+                oCN.BeginTran();
+                //鍒犻櫎宸茬粡鍏宠仈鐨勬暟鎹�
+                oCN.RunProc("Delete From Gy_UserCustomerRelation  where HUserID='" + msg3.ToString() + "'");
+                foreach (Models.Gy_UserCustomer oItem in lsmain)
+                {
+                    //閲嶆柊鍐欏叆鍏宠仈鏁版嵁
+                    oCN.RunProc("insert into Gy_UserCustomerRelation (HCusID,HUserID) values ('" + oItem.HCusID + "','" + msg3.ToString() + "')");
+                }
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region 鐢ㄦ埛鍏宠仈瀹㈡埛 鏂囦欢涓婁紶
         [Route("Xt_User/Gy_UserCustomer_ImportByExcel")]
         [HttpPost]
@@ -2014,12 +3409,26 @@
                         }
                     }
 
-                    //鍒ゅ畾璇ョ敤鎴蜂笌瀹㈡埛鏄惁宸茬粡鍏宠仈
-                    sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
+                    //鍒ゅ畾瀹㈡埛鏄惁宸茬粡鍏宠仈鐢ㄦ埛
+                    sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
+                            " from Gy_UserCustomerRelation as a" +
+                            " left join Gy_Czygl as b on a.HUserID = b.Czybm " +
+                            " left join Gy_Customer as c on a.HCusID = c.HItemID " +
+                            " where a.HCusID = " + HCusID;
                     ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
-                    if (ds.Tables[0].Rows.Count > 0)
+                    if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!= HUserID)
                     {
-                        err += "鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴凤紱";
+                        err += "鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆戯紱";
+                    }
+                    else
+                    {
+                        //鍒ゅ畾璇ョ敤鎴蜂笌瀹㈡埛鏄惁宸茬粡鍏宠仈
+                        sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                        if (ds.Tables[0].Rows.Count > 0)
+                        {
+                            err += "鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴凤紱";
+                        }
                     }
 
                     tb2.Rows[i - 1]["鍒ゅ畾缁撴灉"] = err;
@@ -2101,12 +3510,26 @@
                         ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
                         if (ds.Tables[0].Rows.Count == 0)
                         {
-                            sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
+                            sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
+                            " from Gy_UserCustomerRelation as a" +
+                            " left join Gy_Czygl as b on a.HUserID = b.Czybm " +
+                            " left join Gy_Customer as c on a.HCusID = c.HItemID " +
+                            " where a.HCusID = " + HCusID;
+                            ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                            if (ds.Tables[0].Rows.Count == 0)
+                            {
+                                sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
                                 "values(" +
                                 "'" + HUserID + "'" +
                                 "," + HCusID + "" +
                                 ")";
-                            oCN.RunProc(sql);
+                                oCN.RunProc(sql);
+                            }
+                            else
+                            {
+                                err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
+                            }
+                            i++;
                         }
                         else
                         {
@@ -2114,7 +3537,18 @@
                         }
                         i++;
                     }
-                }else if(saveType == "2")
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "瀵煎叆閿欒锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if(saveType == "2")
                 {
                     oCN.BeginTran();
                     string err = "";
@@ -2130,20 +3564,34 @@
                         string HOrgNumber = item["缁勭粐浠g爜"].ToString();
                         string HOrgName = item["缁勭粐鍚嶇О"].ToString();
 
-                        sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
+
+                        sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
+                            " from Gy_UserCustomerRelation as a" +
+                            " left join Gy_Czygl as b on a.HUserID = b.Czybm " +
+                            " left join Gy_Customer as c on a.HCusID = c.HItemID " +
+                            " where a.HCusID = " + HCusID;
                         ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
-                        if (ds.Tables[0].Rows.Count == 0)
+                        if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!=HUserID)
                         {
-                            sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
-                                "values(" +
-                                "'" + HUserID + "'" +
-                                "," + HCusID + "" +
-                                ")";
-                            oCN.RunProc(sql);
+                            err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
                         }
                         else
                         {
-                            err += "绗�" + i + "琛岋細鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴�!";
+                            sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
+                            ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                            if (ds.Tables[0].Rows.Count == 0)
+                            {
+                                sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
+                                    "values(" +
+                                    "'" + HUserID + "'" +
+                                    "," + HCusID + "" +
+                                    ")";
+                                oCN.RunProc(sql);
+                            }
+                            else
+                            {
+                                err += "绗�" + i + "琛岋細鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴�!";
+                            }
                         }
                         i++;
                     }
@@ -2179,58 +3627,320 @@
         }
         #endregion
 
-        #region 鐢ㄦ埛鍏宠仈瀹㈡埛淇濆瓨
-        [Route("Xt_User/SaveUserCustomer")]
-        [HttpPost]
-        public object SaveUserCustomer([FromBody] JObject msg)
+        #region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢鍒楄〃
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationCustomerlist")]
+        [HttpGet]
+        public object UserRelationCustomerlist(string sWhere, string user)
         {
-            var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-            string msg3 = sArray[1].ToString();
-            string msg4 = sArray[2].ToString();
-
-            //鏌ヨ鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log_second("Gy_UserRelationCustomer_Edit", 1, false, msg4))
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鏃犵紪杈戞潈闄愶紒";
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-
-            ListModels oListModels = new ListModels();
             try
             {
-                List<Models.Gy_UserCustomer> lsmain = new List<Models.Gy_UserCustomer>();
-                msg2 = msg2.Substring(1, msg2.Length - 2);
-                msg2 = msg2.Replace("\\", "");
-                msg2 = msg2.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Gy_UserCustomer(msg2);
-                oCN.BeginTran();
-                //鍒犻櫎宸茬粡鍏宠仈鐨勬暟鎹�
-                oCN.RunProc("Delete From Gy_UserCustomerRelation  where HUserID='" + msg3.ToString() + "'");
-                foreach (Models.Gy_UserCustomer oItem in lsmain)
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationCustomer_Query", 1, false, user))
                 {
-                    //閲嶆柊鍐欏叆鍏宠仈鏁版嵁
-                    oCN.RunProc("insert into Gy_UserCustomerRelation (HCusID,HUserID) values ('" + oItem.HCusID + "','" + msg3.ToString() + "')");
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
                 }
-                oCN.Commit();
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserCustomerRelationList_Query order by 鐢ㄦ埛浠g爜 asc,瀹㈡埛浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserCustomerRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,瀹㈡埛浠g爜 asc";
+                    ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
-                //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
-                objJsonResult.data = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
                 return objJsonResult;
             }
             catch (Exception e)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
-                objJsonResult.data = 1;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        
+        #region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationCustomerlist_Drop")]
+        [HttpGet]
+        public object UserRelationCustomerlist_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationCustomer_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserCustomerRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 缂栬緫鍒濆鍖�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserRelationCustomerlist_EditInit")]
+        [HttpGet]
+        public object UserRelationCustomerlist_EditInit(int HItemID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationCustomer_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "select * from h_v_Gy_UserCustomerRelationList_Query where HItemID = " + HItemID;
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserCustomerRelationList_Query");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        #region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 淇濆瓨
+        [Route("Xt_User/UserRelationCustomerlist_Save")]
+        [HttpPost]
+        public object UserRelationCustomerlist_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string user = sArray[1].ToString();
+            string saveType = sArray[2].ToString();
+            try
+            {
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationCustomer_Edit", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+                foreach (JObject item in Excel)
+                {
+                    Dictionary<string, string> dic = new Dictionary<string, string>();
+                    foreach (var itm in item.Properties())
+                    {
+                        dic.Add(itm.Name, itm.Value.ToString());
+                    }
+                    list.Add(dic);
+                }
+
+                if (saveType == "1")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HCusID = item["HCusID"].ToString();          //瀹㈡埛鍐呯爜
+                        string HCusNumber = item["HCusNumber"].ToString();  //瀹㈡埛浠g爜
+                        string HCusName = item["HCusName"].ToString();      //瀹㈡埛鍚嶇О
+
+
+                        sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
+                            " from Gy_UserCustomerRelation as a" +
+                            " left join Gy_Czygl as b on a.HUserID = b.Czybm " +
+                            " left join Gy_Customer as c on a.HCusID = c.HItemID " +
+                            " where a.HCusID = " + HCusID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                        if (ds.Tables[0].Rows.Count == 0)
+                        {
+                            sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
+                                "values(" +
+                                "'" + HUserID + "'" +
+                                "," + HCusID + "" +
+                                ")";
+                            oCN.RunProc(sql);
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if (saveType == "3")
+                {
+                    oCN.BeginTran();
+                    string err = "";
+                    int i = 1;
+                    string sql = "";
+                    foreach (Dictionary<string, string> item in list)
+                    {
+                        string HItemID = item["HItemID"].ToString();        //
+                        string HUserID = item["HUserID"].ToString();        //鐢ㄦ埛浠g爜
+                        string HUserName = item["HUserName"].ToString();    //鐢ㄦ埛鍚嶇О
+                        string HCusID = item["HCusID"].ToString();          //瀹㈡埛鍐呯爜
+                        string HCusNumber = item["HCusNumber"].ToString();  //瀹㈡埛浠g爜
+                        string HCusName = item["HCusName"].ToString();      //瀹㈡埛鍚嶇О
+
+                        sql = "select * from Gy_UserCustomerRelation where HItemID = " + HItemID;
+                        ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                        if (ds.Tables[0].Rows.Count > 0)
+                        {
+                            sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
+                            " from Gy_UserCustomerRelation as a" +
+                            " left join Gy_Czygl as b on a.HUserID = b.Czybm " +
+                            " left join Gy_Customer as c on a.HCusID = c.HItemID " +
+                            " where a.HCusID = " + HCusID + " and a.HItemID <> " + HItemID;
+                            ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
+                            if(ds.Tables[0].Rows.Count == 0)
+                            {
+                                sql = "update Gy_UserCustomerRelation set " +
+                                      "HUserID = '" + HUserID + "' " +
+                                      ",HCusID = " + HCusID + " " +
+                                      "where HItemID = " + HItemID;
+                                oCN.RunProc(sql);
+                            }
+                            else
+                            {
+                                err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
+                            }
+                        }
+                        else
+                        {
+                            err += "绗�" + i + "琛岋細璁板綍涓嶅瓨鍦�!";
+                        }
+                        i++;
+                    }
+                    //鍒ゆ柇鏄惁瀛樺湪閿欒
+                    if (err.Length > 0)
+                    {
+                        oCN.RollBack();
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + err;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛!";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                LogService.Write(e);
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
@@ -2513,8 +4223,8 @@
                     string HProcID = item["HProcID"].ToString();//宸ュ簭ID
                     string HUserID = item["鐢ㄦ埛浠g爜"].ToString();//鐢ㄦ埛浠g爜
                     string czymc = item["鐢ㄦ埛鍚嶇О"].ToString();//鐢ㄦ埛鍚嶇О
-                    string HNumber = item["宸ュ簭浠g爜"].ToString();//渚涘簲鍟嗕唬鐮�
-                    string HName = item["宸ュ簭鍚嶇О"].ToString();//渚涘簲鍟嗗悕绉�
+                    string HNumber = item["宸ュ簭浠g爜"].ToString();//宸ュ簭浠g爜
+                    string HName = item["宸ュ簭鍚嶇О"].ToString();//宸ュ簭鍚嶇О
 
                     var ds = oCN.RunProcReturn("select * from Gy_UserByProcess where  HProcID='" + HProcID + "'and HUserID='" + HUserID + "'", "Gy_UserByProcess");
 
@@ -2555,5 +4265,228 @@
             }
         }
         #endregion
+
+        #region  鐢ㄦ埛鍏宠仈宸ュ簭鍒楄〃鏌ヨ
+        [Route("Xt_User/UserProcesslist")]
+        [HttpGet]
+        public object UserProcesslist(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserProcessList_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql1 = "select * from h_v_Gy_UserProcess where 1 = 1";
+                string sql = sql1 + sWhere + " order by 鐢ㄦ埛浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserProcess");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈宸ュ簭鍒楄〃 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/Gy_UserProcessDrop")]
+        [HttpGet]
+        public object Gy_UserProcessDrop(string HItemID, string user)
+        {
+            try
+            {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserProcessList_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                if (HItemID == null || HItemID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserByProcess where HItemID = " + HItemID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈渚涘簲鍟嗙淮鎶ゅ垪琛�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/Gy_UserSupplierRelationList")]
+        [HttpGet]
+        public object Gy_UserSupplierRelationList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserSupplierRelationList", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql = "";
+
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    sql = "select * from h_v_Gy_UserSupplierRelationList_Query order by 鐢ㄦ埛浠g爜 asc,渚涘簲鍟嗕唬鐮� asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserSupplierRelationList_Query");
+                }
+                else
+                {
+                    sql = "select * from h_v_Gy_UserSupplierRelationList_Query where 1=1 ";
+                    sql = sql + sWhere + " order by 鐢ㄦ埛浠g爜 asc,渚涘簲鍟嗕唬鐮� asc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserSupplierRelationList_Query");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢ㄦ埛鍏宠仈渚涘簲鍟嗙淮鎶� 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xt_User/UserSupplierRelationList_Drop")]
+        [HttpGet]
+        public object UserSupplierRelationList_Drop(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_UserSupplierRelation_Delete", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                string sql = "delete from Gy_UserSupplierRelation where HItemID = " + HInterID;
+                oCN.RunProc(sql);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1