From 9a75f7db9431032c0f1ecc64be4966a25c74bafa Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 05 十一月 2024 16:48:12 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 1172 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 1,020 insertions(+), 152 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 465de7c..67f7da7 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -1,16 +1,23 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Pub_Class;
+using SyntacticSugar.constant;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
+using System.Web;
 using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
 using WebAPI.Models;
 namespace WebAPI.Controllers
 {
     public class Gy_DepartmentController : ApiController
     {
+        //鑾峰彇绯荤粺鍙傛暟
+        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
 
         private json objJsonResult = new json();
@@ -25,20 +32,195 @@
         /// </summary>
         [Route("Gy_Department/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere, string user, string Organization)
         {
             try
             {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 閮ㄩ棬浠g爜", "h_v_IF_DepartmentList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere + "order by 閮ㄩ棬浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                 }
+
+                //娣诲姞鍒楀悕
+                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鍒楀璞$殑鍒楀悕
+                }
+
+                if (ds.Tables[0].Rows.Count > 0 && ds != null)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    objJsonResult.list = columnNameList;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
+                    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;
+            }
+        }
+
+
+
+        #region 閮ㄩ棬 鏍戝舰鍥�
+        public class TreeModel
+        {
+            public string id { get; set; }
+            public string title { get; set; }
+            public List<TreeModel> children = new List<TreeModel>();
+        }
+        [Route("Gy_Department/Gy_DepartmentTreeList")]
+        [HttpGet]
+        public object Gy_DepartmentTreeList(string sWhere)
+        {
+            try
+            {
+                string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Department where 1=1 " + sWhere + " order by hnumber");
+
+                ds = oCN.RunProcReturn(sql1, "Gy_Department");
+
+                List<TreeModel> treeModels = new List<TreeModel>();
+                TreeModel first = new TreeModel();
+                first.id = "0";
+                first.title = "閮ㄩ棬璁剧疆";
+                treeModels.Add(first);
+
+                foreach (DataRow row in ds.Tables[0].Rows)
+                {
+                    var strLen = row["hitemid"].ToString().Split('.');
+                    if (strLen.Length == 1)
+                    {
+                        TreeModel tree = new TreeModel();
+                        tree.id = row["hitemid"].ToString();
+                        tree.title = row["hname"].ToString();
+                        treeModels[0].children.Add(tree);
+                    }
+                }
+                digui(ds.Tables[0], treeModels[0].children, 2);
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 閫掑綊鍑芥暟
+        /// </summary>
+        public void digui(DataTable dt, List<TreeModel> tree, int num)
+        {
+            for (int m = 0; m < tree.Count; m++)
+            {
+                tree[m].children = new List<TreeModel>();
+                for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+                {
+                    var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
+                    if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
+                    {
+                        TreeModel tbjson = new TreeModel();
+                        tbjson.id = dt.Rows[i]["hitemid"].ToString();
+                        tbjson.title = dt.Rows[i]["hname"].ToString();
+                        tree[m].children.Add(tbjson);
+                    }
+                }
+                var strLens = tree[m].id.Split('.');
+                for (int i = 0; i < tree[m].children.Count; i++)
+                {
+                    digui(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+                }
+            }
+
+        }
+        #endregion
+
+
+        #region 璁惧鍒嗗竷 鐢熶骇璧勬簮瀵瑰簲鐨勮鍗� 
+
+        [Route("Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce")]
+        [HttpGet]
+        public object Sc_OrderStateDistribution_Souce(string sWhere,string user,int OrganizationID)
+        {
+            try
+            {
+                string sql1 = string.Format("exec h_p_sc_HDeptSouceMOList {0},{1}", sWhere, OrganizationID);
+
+                ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptSouceMOList");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Gy_Department/cx")]
+        [HttpGet]
+        public object cx(long HInterID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentListDetail where HitemID =  " + HInterID, "h_v_IF_DepartmentListDetail");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -66,110 +248,91 @@
             }
         }
 
-
         /// <summary>
-        /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
+        /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘
         /// </summary>
-        [Route("Gy_Department/cx")]
+        /// <returns></returns>
+        [Route("DeltetGy_Department")]
         [HttpGet]
-        public object cx(long HInterID)
+        public object DeltetGy_Department(string HItemID, string user)
         {
+            DataSet ds;
+            DataSet ds1;
             try
             {
-                ds = oCN.RunProcReturn("select * from Gy_Department where hitemid =  " + HInterID, "Gy_Department");
-                
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    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;
-            }
-        }
-
-        /// <summary>
-        /// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("Gy_Department/Delete_Json")]
-        [HttpGet]
-        public object Delete_Json(long HItemID,string User,string ModRightNameDelete)
-        {
-            DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
-            DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
-            try
-            {
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true,User))
+                //鍒犻櫎鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (oDeptHlp.GetInfoByID(HItemID))
-                {
-                    if (oDept.HavChildCodes(HItemID))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
-                    if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    //
-                    if (oDept.DeleteByID(HItemID))
-                    {
-                        //鍐欏叆鏃ュ織
-                        ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
-                        //鏇存柊涓婄骇涓� 鏈骇
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍒犻櫎鎴愬姛";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍒犻櫎澶辫触";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID =  " + HItemID, "Gy_Department");
 
-                objJsonResult.code = "1";
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (string.IsNullOrWhiteSpace(HItemID))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+                ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department");
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult; ;
+                }
+                ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department  Where HParentID='" + HItemID + "'", "Gy_Department");
+                if (ds1.Tables[0].Rows.Count != 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+                if (HUseFlag == "宸蹭娇鐢�")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //v
+                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+                //if (HStopflag)
+                //{
+                //    oCN.RollBack();//鍥炴粴浜嬪姟
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                oCN.RunProc("delete from Gy_Department where HItemID=" + HItemID);
+                oCN.Commit();//鎻愪氦浜嬪姟
+                objJsonResult.code = "0";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛";
+                objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
                 objJsonResult.data = null;
-                return objJsonResult;
+                return objJsonResult; ;
+
             }
             catch (Exception e)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -250,7 +413,8 @@
         [HttpPost]
         public object AddBill([FromBody] JObject oMain)
         {
-            try {
+            try
+            {
                 var _value = oMain["oMain"].ToString();
                 string msg1 = _value.ToString();
                 //鍙嶅簭鍒楀寲
@@ -259,7 +423,7 @@
                 DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
                 DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
 
-               
+
 
                 List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
 
@@ -302,15 +466,11 @@
                 oCN.RunProc("Insert Into Gy_Department " +
                 "(HNumber,HShortNumber,HName,HParentID" +
                 ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
-                ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" +
-                ",HUpdater,HChecker,HDeleteMan" +
-                ",HSecManagerID,HCreateDate" +
+                ",HCREATEORGID,HUSEORGID" +
                 ") " +
                 " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
                 ",'',0,'" + HRemark + "',0,''" +
-                "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" +
-                ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" +
-                "," + HSecManagerID + ", getdate()" +
+                "," + HCreateOrgID + "," + HUseOrgID + "" +
               ") ");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -321,7 +481,7 @@
                 //objJsonResult.data = null;
                 return objJsonResult;
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 oCN.RollBack();
                 objJsonResult.code = "0";
@@ -334,7 +494,7 @@
 
 
         /// <summary>
-        /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+        /// 淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
@@ -354,89 +514,165 @@
                 string msg2 = sArray[0].ToString();
                 string msg3 = sArray[1].ToString();
                 string msg4 = sArray[2].ToString();
-                string msg5 = sArray[3].ToString();
+                //string msg4 = sArray[2].ToString();
+                //string msg5 = sArray[3].ToString();
+
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 //鍙嶅簭鍒楀寲
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");
                 msg2 = "[" + msg2.ToString() + "]";
                 List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
 
-                long HItemID = int.Parse(msg3);
+                long HItemID = list[0].HItemID;
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
-                string HShortNumber = list[0].HShortNumber;
                 string HRemark = list[0].HRemark;
                 string HUseFlag = list[0].HUseFlag;
-                long HParentID = list[0].HParentID;
                 string HBarCode = list[0].HBarCode;
                 string HHelpCode = list[0].HHelpCode;
+                string HUpDater = msg3;
+                long HEmpID = list[0].HEmpID;
+                bool HStopflag = list[0].HStopflag;
                 long HSecManagerID = list[0].HSecManagerID;
                 //string HCreator = list[0].HCreator;
                 long HCreateOrgID = list[0].HCreateOrgID;
                 //DateTime HCreateDate = list[0].HCreateDate;
                 long HUseOrgID = list[0].HUseOrgID;
-                string HUpdater = list[0].HUpDater;
                 //DateTime HUpdateDate = list[0].HUpDateDate;
                 string HChecker = list[0].HChecker;
                 //DateTime HCheckDate = list[0].HCheckDate;
                 string HDeleteMan = list[0].HDeleteMan;
                 //DateTime HDeleteDate = list[0].HDeleteDate;
+                //鏈骇鏍囧織
+                bool HEndFlag = true;
+                long HEntityID = 1;
 
+                //寰楀埌鐭唬鐮�
+                string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
+                if (HShortNumber.Trim() == "")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+                //绛夌骇
+                int HLevel = DBUtility.ClsPub.GetLevel(HNumber);
 
+                //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+                long HParentID = 0;
+                string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
+                if (sParent.Trim() == "")
+                {
+                    HParentID = 0;
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Department");
+                    if (ds.Tables[0].Rows.Count > 0)
+                    {
+                        HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                }
+              
                 //鍒ゆ柇鏉冮檺
-                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+
+                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //if (oDept.HavSameNumber(HItemID, HNumber))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "浠g爜閲嶅锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                if (HItemID == 0)
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    //鏂板
+                    oCN.BeginTran();
+                    oCN.RunProc("Insert into Gy_Department " +
+                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
+                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
+                        "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+                    //淇敼涓婄骇涓洪潪鏈骇浠g爜
+                    oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    oCN.Commit();
                 }
-
-
-                if (!DBUtility.ClsPub.AllowNumber(HNumber))
+                else
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    oCN.BeginTran();
+                    //涓昏〃
+                    oCN.RunProc("Update Gy_Department set " +
+                        " HNumber='" + HNumber + "'" +
+                        ",HName='" + HName + "'" +
+                        ",HHelpCode='" + HHelpCode + "'" +
+                        ",HLevel='" + HLevel + "'" +
+                        ",HShortNumber='" + HShortNumber + "'" +
+                        ",HBarCodeForBase='" + HBarCode + "'" +
+                        ",HParentID=" + HParentID +
+                        ",HEmpID=" + HEmpID.ToString() +
+                        ",HUSEORGID=" + HUseOrgID.ToString() +
+                        ",HCREATEORGID=" + HCreateOrgID.ToString() +
+                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+                        ",HUpDater='" + HUpDater + "'" +
+                        ",HUpDateDate= getdate()" +
+                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    //淇敼瀛愰」鐩唬鐮�
+                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+                    //灏嗕笂绾� 涓洪潪鏈骇
+                    oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    oCN.Commit();
                 }
-
-                if (oDept.HavSameNumber(HItemID, HNumber))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "浠g爜閲嶅锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-
-                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
-                oCN.BeginTran();
-                //涓昏〃
-                oCN.RunProc("Update Gy_Department set " +
-                    " HNumber='" + HNumber + "'" +
-                    ",HName='" + HName + "'" +
-                    ",HShortNumber='" + HShortNumber + "'" +
-                    ",HParentID=" + HParentID +
-                    ",HUpdater='" + HUpdater + "'" +
-                    ",HUpdateDate= getdate()" +
-                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
-                //淇敼瀛愰」鐩唬鐮�
-                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
-                //灏嗕笂绾� 涓洪潪鏈骇
-                oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-                //
-                oCN.Commit();
-                objJsonResult.code = "1";
+                objJsonResult.code = "0";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
-                //objJsonResult.data = null;
+                objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                objJsonResult.data = 1;
                 return objJsonResult;
             }
             catch (Exception e)
             {
-                oCN.RollBack();
+                //oCN.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "Exception锛�" + e.Message;
@@ -444,7 +680,6 @@
                 return objJsonResult;
             }
         }
-
 
         /// <summary>
         /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
@@ -532,8 +767,641 @@
             }
         }
 
+        [Route("Gy_Department/SaveGy_DepartmentListApi")]
+        [HttpPost]
+        public object SaveGy_DepartmentListApi([FromBody] JObject oMain)
+        {
+            try
+            {
+                var model = oMain["model"].ToString();
+                //鍙嶅簭鍒楀寲
+                model = "[" + model + "]";
+                List<Department> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(model);
+                string sql = string.Empty;
+                oCN.BeginTran();
+                sql = $"delete Gy_Department where HItemID = {lsmain[0].HItemID}";
+                oCN.RunProc(sql);
+                sql = "set identity_insert Gy_Department on";
+                oCN.RunProc(sql);
+                //涓昏〃
+                oCN.RunProc("Insert Into Gy_Department " +
+              "(HItemID,HNumber,HShortNumber,HName,HParentID" +
+              ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+              ",HCREATEORGID,HUSEORGID,HERPItemID" +
+              ") " +
+              " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HName + "',0" +
+              ",'',0,'" + lsmain[0].HRemark + "',0,''" +
+              "," + lsmain[0].HCreateOrgID + "," + lsmain[0].HUseOrgID + "," + lsmain[0].HItemID +
+            ") ");
+                sql = "set identity_insert Gy_Department off";
+                oCN.RunProc(sql);
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                //objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #region [鍚屾鍩虹璧勬枡]
+        [Route("Gy_Department/Gy_DepartmentViewApi")]
+        [HttpGet]
+        public json Gy_DepartmentViewApi(string Number, string Type)
+        {
+            string sql = string.Empty;
+            string sReturn = "";
+            if (oSystemParameter.ShowBill(ref sReturn) == true)
+            {
+                //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+                if (oSystemParameter.omodel.WMS_CloudMode == "Y")
+                {
+                    #region [绉佹湁浜戞ā寮忥紝鐩存帴璋冪敤鏁版嵁搴撳瓨鍌ㄨ繃绋嬫洿鏂癩
+                    try
+                    {
+                        oCN.BeginTran();
+                        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+                        DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPBasicInfoToLocal '" + Number + "','" + Type + "'", "h_p_WMS_ERPBasicInfoToLocal");
+                        if (DS == null)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍩虹璧勬枡鍚屾澶辫触";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "ERP涓笉瀛樺湪璇ヤ唬鐮�";
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                            else
+                            {
+                                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
+                }
+                else
+                {
+                    #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
+                    var json = new
+                    {
+                        CreateOrgId = 0,
+                        Number = Number,
+                        Id = ""
+                    };
+                    #region [閲戣澏閮ㄥ垎]
+                    //鐧诲綍閲戣澏
+                    var loginRet = InvokeHelper.Login();
+                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+                    //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+                    if (isSuccess < 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = loginRet;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //鏌ョ湅 鑾峰彇鏁版嵁                    
+                    var _result = InvokeHelper.View("BD_Department", JsonConvert.SerializeObject(json));
+                    var _saveObj = JObject.Parse(_result);
+                    //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
+                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "閲戣澏閮ㄩ棬鍚屾澶辫触jsonRoot锛�" + _result;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+
+                    #endregion
+                    //鑾峰彇鏁版嵁
+                    DataSet Ds;
+                    Ds = oCN.RunProcReturn("select * from Gy_Department where HNumber = '" + Number + "'", "Gy_Department");
+                    if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
+                    {
+
+                    }
+
+                    #region [琛ㄦ暟鎹祴鍊糫
+                    var jsonData = new
+                    {
+                        HItemID = _saveObj["Result"]["Result"]["Id"],
+                        HERPItemID = _saveObj["Result"]["Result"]["Id"],
+                        HNumber = _saveObj["Result"]["Result"]["Number"],
+                        HName          = _saveObj["Result"]["Result"]["Name"][0]["Value"],
+                        HShortNumber   = _saveObj["Result"]["Result"]["Number"],
+                        HParentID      = 0,
+                        HLevel         = 1,
+                        HEndFlag       = 1,
+                        HStopflag      = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+                        HRemark        = "CLD-ERP瀵煎叆",
+                        HUseFlag       = "宸蹭娇鐢�",
+                        HMakeTime      = _saveObj["Result"]["Result"]["CreateDate"],
+                        HCREATEORGID   = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
+                        HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+                    };
+                    #endregion
+                    // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
+                    sql = $"delete from Gy_Department where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
+                    oCN.RunProc(sql);
+
+                    sql = "set identity_insert Gy_Department on";
+                    oCN.RunProc(sql);
+
+                    //鎻掑叆琛�
+                    sql = $@"
+                insert into Gy_Department
+                (HItemID,HERPItemID,HNumber,HName,HShortNumber,HParentID
+	            ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HCREATEORGID,HUSEORGID
+                 )
+                values
+                ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
+                '{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID})";
+
+                    oCN.RunProc(sql);
+
+                    sql = "set identity_insert Gy_Department off";
+                    oCN.RunProc(sql);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "閮ㄩ棬鍚屾鎴愬姛锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+
+                    #endregion
+                }
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍩虹璧勬枡璇诲彇澶辫触锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 閮ㄩ棬瀹℃牳銆佸弽瀹℃牳
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_Department/AuditGy_Department")]
+        [HttpGet]
+        public object AuditGy_MaterType(int HInterID, int IsAudit, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Check", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_Department set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "瀹℃牳鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                {
+                    oCN.RunProc("update Gy_Department set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 閮ㄩ棬绂佺敤銆佸弽绂佺敤
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_Department/StopGy_Department")]
+        [HttpGet]
+        public object StopGy_MaterType(int HInterID, int IsStop, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Stop", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_Department set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "绂佺敤鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                {
+                    oCN.RunProc("update Gy_Department set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 閮ㄩ棬鍒楄〃 鏂囦欢涓婁紶
+        //[Route("Gy_Department/Gy_Process_Excel")]
+        //[HttpPost]
+        //public json Gy_Department_Excel()
+        //{
+        //    json res = new json();
+        //    try
+        //    {
+        //        //鑾峰彇鏂囦欢鍚嶇О
+        //        var file = HttpContext.Current.Request.Files[0];
+        //        //鑾峰彇鏂囦欢鐗╃悊璺緞
+        //        string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+        //        //淇濆瓨鏂囦欢
+        //        file.SaveAs(ExcelPath);
+
+        //        NpoiHelper np = new NpoiHelper();
+        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+        //        //鍒犻櫎鏂囦欢
+        //        File.Delete(ExcelPath);
+
+        //        //鍒涘缓涓存椂琛�
+        //        DataTable provisional = new DataTable("dt2");
+
+        //        //娣诲姞鍒楀悕
+        //        for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+        //        {
+        //            provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+        //        }
+
+        //        //娣诲姞鏁版嵁
+        //        for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+        //        {
+        //            DataRow row = provisional.NewRow();
+        //            for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+        //            {
+        //                row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+        //            }
+        //            provisional.Rows.Add(row);
+        //        }
+
+        //        //鍒ゆ柇鍒�
+        //        string error = JudgmentColumns(provisional);
+        //        if (error.Length > 0)
+        //        {
+        //            res.code = "0";
+        //            res.count = 0;
+        //            res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+        //            res.data = null;
+        //            return res;
+        //        }
+
+        //        for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+        //        {
+        //            string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["閮ㄩ棬浠g爜"].ToString());
+        //            string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["閮ㄩ棬鍚嶇О"].ToString());
+        //            string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+        //            string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜哄悕绉�"].ToString());
+        //            string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鏉″舰鐮�"].ToString());
+        //            string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+        //            string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+
+        //            //鍒ゆ柇璐熻矗浜烘槸鍚﹀瓨鍦�
+        //            if (JudgeEmp(HEmpNumber, HEmpName))
+        //            {
+        //                res.code = CodeConstant.FAIL;
+        //                res.count = CountConstant.FAIL;
+        //                res.Message = "褰撳墠鑱屽憳涓嶅瓨鍦�";
+        //                res.data = null;
+        //                return res;
+        //            }
+        //            //鑾峰彇鐪熷疄琛屾暟
+        //            int line = i + 1;
+        //        }
+
+        //        res.code = "1";
+        //        res.count = 1;
+        //        res.Message = error;
+        //        res.data = provisional;
+        //        return res;
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        res.code = "0";
+        //        res.count = 0;
+        //        res.Message = "Exception锛�" + e.ToString();
+        //        res.data = null;
+        //        return res;
+        //    }
+        //}
+
+        /// <summary>
+        /// 鍒ゆ柇褰撳墠鑱屽憳鏄惁瀛樺湪
+        /// </summary>
+        /// <param name="HEmpNumber"></param>
+        /// <param name="HEmpName"></param>
+        /// <returns></returns>
+        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
+        //{
+        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
+        //    {
+        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
+        //    }
+        //    return false;
+        //}
+
+        /// <summary>
+        /// 鍒ゆ柇鍒�
+        /// </summary>
+        /// <param name="provisional"></param>
+        /// <returns></returns>
+        private static string JudgmentColumns(DataTable provisional)
+        {
+            var error = "";
+
+            //鏌ヨ娌℃湁鐨勫垪
+            if (!provisional.Columns.Contains("閮ㄩ棬浠g爜"))
+                error += "娌℃湁鎵惧埌銆愰儴闂ㄤ唬鐮併�戠殑鏍囬,";
+
+            if (!provisional.Columns.Contains("閮ㄩ棬鍚嶇О"))
+                error += "娌℃湁鎵惧埌銆愰儴闂ㄥ悕绉般�戠殑鏍囬,";
+            return error;
+        }
+        #endregion
+
+        #region 閮ㄩ棬鍒楄〃 瀵煎叆(淇濆瓨)
+        [Route("Gy_Department/Gy_Process_btnSave")]
+        [HttpPost]
+        public object Gy_InspectBasis_btnSave([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 organ = sArray[2].ToString();
+            json res = new json();
+            try
+            {
+                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+                {
+                    res.code = "0";
+                    res.count = 0;
+                    res.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    res.data = null;
+                    return res;
+                }
+
+                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);
+                }
+
+                oCN.BeginTran();
+                int i = 1;
+                foreach (Dictionary<string, string> item in list)
+                {
+                    string HNumber = item["閮ㄩ棬浠g爜"].ToString();
+                    string HName = item["閮ㄩ棬鍚嶇О"].ToString();
+                    string HEmpNumber = item["璐熻矗浜轰唬鐮�"].ToString();
+                    string HEmpName = item["璐熻矗浜哄悕绉�"].ToString();
+                    string HBarCode = item["鏉″舰鐮�"].ToString();
+                    string HHelpCode = item["鍔╄鐮�"].ToString();
+                    string HRemark = item["澶囨敞"].ToString();
+                    int HEmpID = 0;
+                    if (!String.IsNullOrEmpty(HEmpName) && !String.IsNullOrEmpty(HEmpNumber))
+                    {
+                        DataSet emp = oCN.RunProcReturn("select HItemID from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+                        HEmpID = (int)emp.Tables[0].Rows[0]["HItemID"];
+                    }
+                    string sShortNumber;
+                    sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+                    if (sShortNumber.Trim() == "")
+                    {
+                        res.code = "0";
+                        res.count = 0;
+                        res.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�";
+                        res.data = 1;
+                        return res;
+                    }
+                    int HEndFlag = 1;//鏈骇鏍囧織
+                    int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
 
 
-        //
+                    if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+                    {
+                        res.code = "0";
+                        res.count = 0;
+                        res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                        res.data = 1;
+                        return res;
+                    }
+
+                    ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HNumber + "'", "Gy_InspectInstruMent");
+
+                    if (ds.Tables[0].Rows.Count == 0)
+                    {
+
+                        string sql = "insert into Gy_Department (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HEmpID, HBarCodeForBase)" +
+                            $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{HEmpID}', '{HBarCode}')";
+                        oCN.RunProc(sql);
+                    }
+                    else
+                    {
+                        oCN.RunProc("update Gy_Department  set  HName ='" + HName + "' , HHelpCode = '" + HHelpCode + " ', HBarCodeForBase = '" + HBarCode + "', HEmpID = '" + HEmpID + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+                    }
+
+                    i++;
+                }
+
+                oCN.Commit();
+
+                res.code = "1";
+                res.count = 1;
+                res.Message = "瀵煎叆鎴愬姛!";
+                res.data = null;
+                return res;
+            }
+            catch (Exception e)
+            {
+                LogService.Write(e);
+                res.code = "0";
+                res.count = 0;
+                res.Message = "Exception锛�" + e.ToString();
+                res.data = null;
+                return res;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1