From 5b6d9876d89219f34a2fda2820b1de752d28d77e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 08 四月 2025 11:05:24 +0800
Subject: [PATCH] 物料:增加 制单人

---
 WebAPI/Controllers/XSGL/Xs_ContractBillController.cs | 2617 ++++++++++++++--------------------------------------------
 1 files changed, 654 insertions(+), 1,963 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs b/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
index 6269528..f77f68d 100644
--- a/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
@@ -18,138 +18,63 @@
         //鑾峰彇绯荤粺鍙傛暟
         Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-        public DAL.ClsXs_SeOrderBill BillOld = new DAL.ClsXs_SeOrderBill();
-        public DAL.ClsXs_SeOrderBill BillNew0 = new DAL.ClsXs_SeOrderBill();
-
+        public DAL.ClsXs_ContractBill BillOld = new DAL.ClsXs_ContractBill();
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
 
-        /// <summary>
-        /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("Xs_SeOrderBill/cx")]
+
+        #region 鑾峰彇鍚堝悓鍒楄〃
+        [Route("Xs_ContractBill/list")]
         [HttpGet]
-        public object cx(long HInterID)
+        public object list(string sWhere, string user)
         {
             try
             {
+                List<object> columnNameList = new List<object>();
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
 
-                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                if (!DBUtility.ClsPub.Security_Log("Xs_ContractBill", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
+                    objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
                     objJsonResult.data = null;
                     return objJsonResult;
+                }
+                string sql = "select * from h_v_Xs_ContractBillAllList where 1 = 1 ";
+
+                if (sWhere == "" || sWhere == null)
+                {
+                    ds = oCN.RunProcReturn(sql + " order by hmainid desc", "h_v_Xs_ContractBillAllList");
                 }
                 else
                 {
-                    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("Xs_SeOrderBill/list")]
-        [HttpGet]
-        public object list(string sWhere,string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏌ヨ鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_ContractBillAllList");
                 }
 
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere+ " order by hmainid desc";
-                    ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
-                }
+                //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+                //bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+                //if (!isCgjl)
+                //{
+                //    sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0  )";
+                //}
+                //string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
+                //ds = oCN.RunProcReturn(sql, "h_v_Xs_ContractBillList");
 
-                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>
-        /// 杩斿洖閿�鍞鍗曞姩鎬佸垪琛�
-        /// </summary>
-        /// <param name="sWhere"></param>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        [Route("Xs_SeOrderBill/DyColList")]
-        [HttpGet]
-        public object DyColList(string sWhere, string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏌ヨ鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_IF_SeOrderBillList");
-                List<object> listCol = new List<object>();
                 foreach (DataColumn col in ds.Tables[0].Columns)
                 {
                     Type dataType = col.DataType;
-                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    listCol.Add(JsonConvert.DeserializeObject(str));
+                    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 = listCol;
+                objJsonResult.list = columnNameList;
                 return objJsonResult;
-               
             }
             catch (Exception e)
             {
@@ -161,10 +86,12 @@
             }
         }
 
-        #region 閿�鍞鍗� 淇濆瓨/缂栬緫鍔熻兘
-        [Route("Xs_SeOrder/SeOrderBillEdit")]
+        #endregion
+
+        #region 閲囪喘鍚堝悓 淇濆瓨/缂栬緫鍔熻兘
+        [Route("Xs_ContractBill/ContractBillEdit")]
         [HttpPost]
-        public object SeOrderBillEdit([FromBody] JObject sMainSub)
+        public object ContractBillEdit([FromBody] JObject sMainSub)
         {
             try
             {
@@ -200,94 +127,142 @@
                 return objJsonResult;
             }
         }
-
+        /// <summary>
+        /// 鏂板涓庢洿鏂板悎鍚�
+        /// </summary>
         public json AddBillMain(string msg1)
         {
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
             string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
-            int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
-            string user = sArray[3].ToString();
+            string msg4 = sArray[2].ToString(); //瀛愯〃2鏁版嵁
+            int OperationType = int.Parse(sArray[3].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+            string user = sArray[4].ToString();
             string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
 
             try
             {
                 msg2 = "[" + msg2.ToString() + "]";
-                List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(msg2);
+                List<ClsXs_ContractBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_ContractBillMain>>(msg2);
 
                 long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
                 string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
-                long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
                 DateTime HDate = mainList[0].HDate;//鏃ユ湡
                 string HRemark = mainList[0].HRemark;//澶囨敞
                 long HCusID = mainList[0].HCusID;//瀹㈡埛
                 long HEmpID = mainList[0].HEmpID;//涓氬姟鍛�
                 long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
                 long HCurID = mainList[0].HCurID;//甯佸埆
-                Single HExRate = mainList[0].HExRate;//姹囩巼
-                long HManagerID = mainList[0].HManagerID;//涓荤
-                long HSellSID = mainList[0].HSellSID;//閿�鍞柟寮�
+                Single HExRate = (float)mainList[0].HExRate;//姹囩巼
                 long HSSID = mainList[0].HSSID;//缁撶畻鏂瑰紡
-                DateTime HSSDate = mainList[0].HSSDate;//缁撶畻鏃ユ湡
-                string HMaker = user;//鍒跺崟浜�
-                string HAddress = mainList[0].HAddress;//鍦板潃
+                string HContractName = mainList[0].HContractName;//鍚堝悓鍚嶇О
+                DateTime HContractDate = mainList[0].HContractDate;//缁撶畻鏃ユ湡
 
-                List<ClsXs_SeOrderBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(msg2);
+                string HMaker = user;//鍒跺崟浜�
+                string HAddress = mainList[0].HAddress;//浜よ揣鍦板潃
+                string HExplanation = mainList[0].HExplanation;//鎽樿
+                string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙� 
+
+                List<ClsXs_ContractBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_ContractBillMain>>(msg2);
                 DateTime dt = DateTime.Now;
                 long HYear = mainList2[0].HYear == null ? 0 : mainList2[0].HYear;
                 long HPeriod = mainList2[0].HPeriod == null ? 0 : mainList2[0].HPeriod;
                 string HBillType = mainList2[0].HBillType == null ? "''" : mainList2[0].HBillType;
                 string HBillSubType = mainList2[0].HBillSubType == null ? "''" : mainList2[0].HBillSubType;
-                int HBillStatus = mainList2[0].HBillStatus == null ? 0 : mainList2[0].HBillStatus;
+                long HBillStatus = mainList2[0].HBillStatus == null ? 0 : mainList2[0].HBillStatus;
                 string HChecker = mainList2[0].HChecker == null ? "''" : mainList2[0].HChecker;
+                string HUpDater = mainList2[0].HUpDater == null ? "''" : mainList2[0].HUpDater;
+                string HCloseMan = mainList2[0].HCloseMan == null ? "''" : mainList2[0].HCloseMan;
+                string HDeleteMan = mainList2[0].HDeleteMan == null ? "''" : mainList2[0].HDeleteMan;
                 string HCheckDate = mainList2[0].HCheckDate == null ? "''" : mainList2[0].HCheckDate;
                 string HMakeDate = mainList2[0].HMakeDate == null ? "''" : mainList2[0].HMakeDate;
-                string HCloseMan = mainList2[0].HCloseMan == null ? "''" : mainList2[0].HCloseMan;
-                string HCloseDate = mainList2[0].HCloseDate == null ? "''" : mainList2[0].HCloseDate;
-                long HERPInterID = mainList2[0].HERPInterID == null ? 0 : mainList2[0].HERPInterID;
-                string HERPBillType = mainList2[0].HERPBillType == null ? "''" : mainList2[0].HERPBillType;
-                long HSALEORGID = mainList2[0].HSALEORGID == null ? 0 : mainList2[0].HSALEORGID;
+                string HUpDateDate = mainList2[0].HUpDateDate == null ? "''" : mainList2[0].HUpDateDate;
+                string HDeleteDate = mainList2[0].HDeleteDate == null ? "''" : mainList2[0].HDeleteDate;
 
-                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOrderBillList");
+
+                //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+                string s = "";
+                int sYear = 0;
+                int sPeriod = 0;
+                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+                {
+                    objJsonResult.Message = s;
+                    return objJsonResult;
+                }
+
+                ds = oCN.RunProcReturn("select * from h_v_Xs_ContractBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Xs_ContractBillList");
 
                 if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
                 {
+
+                    //淇濆瓨鍓嶆帶鍒�=========================================           
+                    ds = oCN.RunProcReturn("exec h_p_Xs_ContractBill_BeforeSaveCtrl  " + HInterID, "h_p_Xs_ContractBill_BeforeSaveCtrl ");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //=========================================================
                     DataSet Ds;
                     Int64 NewHInterID = 1;
-                    Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Xs_SeOrderBillMain", "Xs_SeOrderBillMain");
+                    Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Xs_ContractBillMain", "Xs_ContractBillMain");
                     if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
                     {
                         NewHInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
                         NewHInterID += 1;
                     }
                     //涓昏〃
-                    oCN.RunProc(@"Insert Into Xs_SeOrderBillMain   
-                        (HBillType,HInterID,HBillNo,HDate
-                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
-                        ,HEmpID,HCusID
-                        ,HBillSubType,HAddress,HSSDate,HSSID,HSellSID,HCurID,HExRate, HManagerID,HDeptID
-                        ,HExplanation,HCheckFlow,HBillStatus,HInnerBillNo
-                        ,HICMOFlag,HChangeMan,HSALEORGID,HERPInterID,HERPBillType
-                        ,HCloseDate,HCloseMan)
-                        values(" + "1401," + HInterID + ",'" + HBillNo + "','" + HDate + "','" +
-                    DateTime.Now.Year + "','" + DateTime.Now.Month + "','" + HRemark + "','" + HMaker + "','" + HMakeDate +
-                    "'," + HEmpID + "," + HCusID + ",'" + HBillType + "','" + HAddress + "','" + HSSDate +
-                    "'," + HSSID + "," + HSellSID + "," + HCurID + "," +  HExRate + "," + HManagerID + "," + HDeptID + ",'" + "''" + "'," + "0," + HBillStatus + ",'" + "''" + "'," +
-                    0 + ",'" + "''" + "'," + HSALEORGID + "," + HERPInterID + ",'" + HERPBillType + "','" + HCloseDate + "','" + HCloseMan + "')");
+                    oCN.RunProc(@"Insert Into Xs_ContractBillMain   
+                        (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+	                    ,HRemark,HPrintQty
+	                    ,HMaker,HMakeDate
+                        ,HContractDate,HContractName,HAddress,HSSID,HCusID,HCurID,HExRate,HEmpID,HDeptID,HExplanation,HInnerBillNo
+                        )
+                        values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1400 + "','" +
+                        1400 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" +
+                        HRemark + "'," + 0 + ",'" +
+                        HMaker + "',getdate(),'" +
+                        HContractDate + "','" + HContractName + "','" + HAddress + "'," + HSSID + "," + HCusID + "," + HCurID + "," + HExRate + "," + HEmpID + "," + HDeptID + ",'" + HExplanation + "','" + HInnerBillNo + "'" +
+                        ")");
                 }
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
-                { //淇敼
-                    oCN.RunProc("update Xs_SeOrderBillMain  set " +
-                                "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
-                                 ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + ",HAddress='" + HAddress + "',HDeptID=" + HDeptID
-                                 + ",HCurID=" + HCurID + ",HExRate=" + HExRate + ",HManagerID=" + HManagerID + ",HSellSID=" + HSellSID
-                                 + ",HSSID=" + HSSID + ",HSSDate='" + HSSDate + "' where HInterID=" + HInterID);
+                {
+                    //淇敼
+                    DataSet dss;
+                    dss = oCN.RunProcReturn("select * from h_v_Xs_ContractBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Xs_ContractBillList");
+                    //鍒ゆ柇鏄惁鍙紪杈�
+                    if (dss.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "" && dss.Tables[0].Rows[0]["瀹℃牳浜�"] != null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    oCN.RunProc("update Xs_ContractBillMain  set " +
+                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
+                                 ",HSSID=" + HSSID + ",HCusID=" + HCusID + ",HCurID=" + HCurID
+                                 + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID
+                                 + ",HAddress='" + HAddress + "',HContractName='" + HContractName + "',HContractDate= '" + HContractDate
+                                 + "' where HInterID=" + HInterID);
 
                     //鍒犻櫎瀛愯〃
-                    oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
+                    oCN.RunProc("delete from Xs_ContractBillSub where HInterID='" + HInterID + "'");
+                    oCN.RunProc("delete from Xs_ContractBillScheme where HInterID='" + HInterID + "'");
                 }
                 //淇濆瓨瀛愯〃
-                objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+                objJsonResult = AddBillSubAndScheme(msg3, msg4, HInterID, HBillNo, OperationType);
 
                 if (objJsonResult.code == "0")
                 {
@@ -313,33 +288,25 @@
                 return objJsonResult;
             }
         }
-
-        public json AddBillSub(string msg3, long HInterID, int OperationType)
+        /// <summary>
+        /// 淇濆瓨椤电
+        /// </summary>
+        /// <param name="msg3">鐗╂枡鏄庣粏</param>
+        /// <param name="msg4">浠樻璁″垝</param>
+        /// <param name="HInterID">鍗曟嵁鍐呯爜</param>
+        /// <param name="OperationType"></param>
+        /// <param name="HBillNo">鍗曟嵁鍙�</param>
+        /// <returns></returns>
+        public json AddBillSubAndScheme(string msg3, string msg4, long HInterID, string HBillNo, int OperationType)
         {
-            List<ClsXs_SeOrderBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(msg3);
+            List<ClsXs_ContractBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_ContractBillSub>>(msg3);
 
-            List<ClsXs_SeOrderBillSub> DetailColl2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(msg3);
-
-            long HSourceInterID = DetailColl2[0].HSourceInterID == null ? 0 : DetailColl2[0].HSourceInterID;
-            long HSourceEntryID = DetailColl2[0].HSourceEntryID == null ? 0 : DetailColl2[0].HSourceEntryID;
-            string HSourceBillNo = DetailColl2[0].HSourceBillNo == null ? "''" : DetailColl2[0].HSourceBillNo;
-            string HSourceBillType = DetailColl2[0].HSourceBillType == null ? "''" : DetailColl2[0].HSourceBillType;
-            double HRelationQty = DetailColl2[0].HRelationQty == null ? 0 : DetailColl2[0].HRelationQty;
-            long HPropertyID = DetailColl2[0].HPropertyID == null ? 0 : DetailColl2[0].HPropertyID;
-            string HBatChNo = DetailColl2[0].HBatChNo == null ? "''" : DetailColl2[0].HBatChNo;
-            long HAuxPropID = DetailColl2[0].HAuxPropID == null ? 0 : DetailColl2[0].HAuxPropID;
-            string HMTONo = DetailColl2[0].HMTONo == null ? "''" : DetailColl2[0].HMTONo;
-            long HERPInterID = DetailColl2[0].HERPInterID == null ? 0 : DetailColl2[0].HERPInterID;
-            long HERPEntryID = DetailColl2[0].HERPEntryID == null ? 0 : DetailColl2[0].HERPEntryID;
-            decimal HBackRelationQty = DetailColl2[0].HBackRelationQty == null ? 0 : DetailColl2[0].HBackRelationQty;
-            long HWhID = DetailColl2[0].HWhID == null ? 0 : DetailColl2[0].HWhID;
-            long HSPID = DetailColl2[0].HSPID == null ? 0 : DetailColl2[0].HSPID;
-
+            List<ClsXs_ContractBillScheme> SchemeColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_ContractBillScheme>>(msg4);
             int i = 0;
-            foreach (ClsXs_SeOrderBillSub oSub in DetailColl)
+            foreach (ClsXs_ContractBillSub oSub in DetailColl)
             {
                 i++;
-                if (oSub.HQty <= 0 || oSub.HQty == null)
+                if (oSub.HQty <= 0 || oSub.HQty == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -377,47 +344,144 @@
 
                 DataSet Cs;
                 Int64 NewHEntryID = 1;
-                Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Xs_SeOrderBillSub", "Xs_SeOrderBillSub");
+                Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Xs_ContractBillSub", "Xs_ContractBillSub");
                 if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                 {
                     NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
                     NewHEntryID += 1;
                 }
 
-                oCN.RunProc($@"Insert into Xs_SeOrderBillSub 
-                (HInterID,HENTRYID,HQty,HMaterID,HUnitID,HRemark
-				,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
-                ,HRelationQty,HRelationMoney,HPrice,HTaxPrice,HMoney,HDiscountRate
-                ,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty
-                ,HPropertyID,HBatChNo,HAuxPropID,HMTONo,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID) 
-                 values({HInterID},{NewHEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
-                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{HSourceInterID},{HSourceEntryID},{HSourceBillNo},{HSourceBillType},{HRelationQty},0,{oSub.HPrice},{oSub.HTaxPrice},{oSub.HMoney},{oSub.HDiscountRate},{oSub.HRelTaxPrice},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HlineTotal},{oSub.HlineTotalBB},getdate(),{oSub.HOutStockQty},{oSub.HInvoiceQty},{HPropertyID},{HBatChNo},{HAuxPropID},
-                  {HMTONo},{HERPInterID},{HERPEntryID},{HBackRelationQty},{HWhID},{HSPID})");
+                oCN.RunProc($@"Insert into Xs_ContractBillSub 
+                (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+                 HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxRate,HTaxMoney,HlineTotal
+	            ) 
+                 values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+                ,{oSub.HMaterID},{oSub.HUnitID},{oSub.HQty},{oSub.HPrice},{oSub.HMoney},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HPrice})");
             }
+            i = 0;
+            //浠樻璁″垝淇濆瓨
+            foreach (ClsXs_ContractBillScheme oSub in SchemeColl)
+            {
+                i++;
+                DataSet Cs;
+                Int64 NewHEntryID = 1;
+                Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Xs_ContractBillScheme", "Xs_ContractBillScheme");
+                if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+                {
+                    NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+                    NewHEntryID += 1;
+                }
 
+                oCN.RunProc($@"Insert into Xs_ContractBillScheme
+                (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+                 HDate,HMoney,HCurID,HExRate) 
+                 values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+                ,'{oSub.HDate}',{oSub.HMoney},{oSub.HCurID},{oSub.HExRate})");
+            }
+            //淇濆瓨鍚庢帶鍒�=========================================              
+            ds = oCN.RunProcReturn("exec h_p_Xs_ContractBill_AfterSaveCtrl " + HInterID, "h_p_Cg_POOrderBill_AfterSaveCtrl");
+
+            if (ds == null || ds.Tables[0].Rows.Count == 0)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            //=========================================================
             objJsonResult.code = "1";
             objJsonResult.count = 1;
             objJsonResult.Message = null;
             objJsonResult.data = null;
             return objJsonResult;
         }
-
         #endregion
 
+        #region 鍒犻櫎
         /// <summary>
         ///鍒犻櫎鍔熻兘
         /// </summary>
         /// <returns></returns>
-        [Route("Xs_SeOrderBill/DeltetSeOrderBill")]
+        [Route("Xs_ContractBill/DeltetXs_ContractBill")]
         [HttpGet]
-        public object DeltetSeOrderBill(string HInterID)
+        public object DeltetXs_ContractBill(string HInterID, string user)
         {
             try
             {
+
+                string HBillNo = "";
+                //鍒犻櫎鍓嶆帶鍒�=========================================      
+                string sql1 = "exec h_p_Xs_ContractBill_BeforeDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
+                ds = oCN.RunProcReturn(sql1, "h_p_Xs_ContractBill_BeforeDelCtrl");
+                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //==================================================================================  
+                //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+                string s = "";
+                int sYear = 0;
+                int sPeriod = 0;
+                DateTime HDate = DateTime.Now;
+                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+                {
+                    objJsonResult.Message = s;
+                    return objJsonResult;
+                }
+                string sReturn = "";
                 oCN.BeginTran();
-                oCN.RunProc("Delete From Xs_SeOrderBillMain where HInterID = " + HInterID);
-                oCN.RunProc("Delete From Xs_SeOrderBillSub where HInterID = " + HInterID);
+                oCN.RunProc("Delete From Xs_ContractBillMain where HInterID = " + HInterID);
+                oCN.RunProc("Delete From Xs_ContractBillSub where HInterID = " + HInterID);
+                oCN.RunProc("Delete From Xs_ContractBillScheme where HInterID = " + HInterID);
                 oCN.Commit();
+
+                //鍒犻櫎鍚庢帶鍒�==================================================================================
+                string sql2 = "exec h_p_Xs_ContractBill_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
+                ds = oCN.RunProcReturn(sql2, "h_p_Xs_ContractBill_AfterDelCtrl");
+                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                {
+                    sReturn = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + sReturn;
+                    objJsonResult.data = null;
+                    oCN.RollBack();
+                    return objJsonResult;
+                }
+                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                {
+                    sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + sReturn;
+                    objJsonResult.data = null;
+                    oCN.RollBack();
+                    return objJsonResult;
+                }
+                //==============================================================================================
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
@@ -434,841 +498,22 @@
                 return objJsonResult;
             }
         }
-
-        #region [鍚屾鎻掍欢]
-        [Route("Xs_SeOrderBill/Xs_SeOrderBillSaveApi")]
-        [HttpPost]
-        public object Xs_SeOrderBillSaveApi([FromBody] JObject sMainSub)
-        {
-            try
-            {
-                //LogService.Write("閿�鍞鍗曞悓姝�,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�" + sMainSub.ToString());
-                var model = sMainSub["model"].ToString();
-                var entry = sMainSub["model"]["HENTRY"].ToString();
-
-                model = "[" + model.ToString() + "]";
-                LogService.Write("閿�鍞鍗曞悓姝� sMainSub:" + sMainSub);
-                List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(model);
-                List<ClsXs_SeOrderBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(entry);
-                string sql = string.Empty;
-                oCN.BeginTran();
-                sql = $"delete Xs_SeOrderBillMain where HinterID = {mainList[0].HInterID}";
-                oCN.RunProc(sql);
-                sql = $"delete Xs_SeOrderBillSub where HinterID = {mainList[0].HInterID}";
-                oCN.RunProc(sql);
-                //涓昏〃
-                oCN.RunProc(@"Insert Into Xs_SeOrderBillMain   
-                        (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
-	                    ,HBillNo,HBillStatus
-	                    ,HAddress,HSSID,HSSDate,HCusID,HCurID,HExRate
-	                    ,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
-	                    ,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate
-	                    ,HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID
-	                    ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE)
-                        values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1401 + "','" +
-                    mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
-                    ",'" + mainList[0].HSSDate + "'," + mainList[0].HCusID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" +
-                    mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
-                     + mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HERPInterID + ",'"
-                    + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "'" + ")");
-                //淇濆瓨瀛愯〃
-                foreach (var oSub in subList)
-                {
-                    sql = $@"
-Insert into Xs_SeOrderBillSub 
-(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
-	,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney
-	,HLineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark
-	,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
-	,HRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
-	,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID
-	,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HMAPID,HSTOCKUNITID,HBASEUNITID
-	,HBFLOWID,HSETTLEORGID,HTAXCOMBINATION,HPRICEUNITID,HISFREE,HPRICECOEFFICIENT
-	,HSYSPRICE,HLIMITDOWNPRICE,HPARENTMATID,HROWTYPE,HROWID,HPARENTROWID
-	,HDELIVERYCONTROL,HLOCALCURRID,HEXCHANGETYPEID,HSETTLECURRID,HSETTLEMODEID
-	,HRECCONDITIONID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HEXCHANGERATE,HTAXRATEID
-	,HCOSTPERCENT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HPRICELISTENTRY) 
-values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HTaxPrice}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}','{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}','{oSub.HLineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HOutStockQty}','{oSub.HInvoiceQty}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HWhID}','{oSub.HSPID}','{oSub.HSTOCKORGID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HMAPID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HSETTLEORGID}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HISFREE}','{oSub.HPRICECOEFFICIENT}','{oSub.HSYSPRICE}','{oSub.HLIMITDOWNPRICE}','{oSub.HPARENTMATID}','{oSub.HROWTYPE}','{oSub.HROWID}','{oSub.HPARENTROWID}','{oSub.HDELIVERYCONTROL}','{oSub.HLOCALCURRID}','{oSub.HEXCHANGETYPEID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HRECCONDITIONID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HEXCHANGERATE}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HPRICELISTENTRY}')";
-                    oCN.RunProc(sql);
-                }
-                oCN.Commit();
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
-                objJsonResult.data = null;
-                return objJsonResult;
-
-            }
-            catch (Exception e)
-            {
-                LogService.Write("閿�鍞鍗曞悓姝ュ紓甯�,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�" + e.Message.ToString());
-
-                oCN.RollBack();
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
         #endregion
 
-        #region [鍚屾鍗曟嵁]
-        [Route("Xs_SeOrderBill/Xs_SeOrderBillViewApi")]
+        #region 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍(鍔犺浇琛ㄧ敤)
+        /// <summary>
+        /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xs_ContractBill/cx")]
         [HttpGet]
-        public json Xs_SeOrderBillViewApi(string BillNo, string BillType)
-        {
-            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_ERPSourceBillToLocal '" + BillNo + "','" + BillType + "'", "h_p_WMS_ERPSourceBillToLocal");
-                        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 = BillNo,
-                        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("SAL_SaleOrder", JsonConvert.SerializeObject(json));
-                    var _saveObj = JObject.Parse(_result);
-                    //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
-                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "閲戣澏閿�鍞鍗曞悓姝ュけ璐sonRoot锛�" + _result;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-
-                    #endregion
-                    //鑾峰彇涓昏〃鏁版嵁
-                    DataSet Ds;
-                    Int64 InterID = 0;
-                    Ds = oCN.RunProcReturn("select * from Xs_SeOrderBillMain where HBillNo = '" + BillNo + "'", "Xs_SeOrderBillMain");
-                    if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
-                    {
-                        InterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
-                    }
-
-                    #region [涓昏〃鏁版嵁璧嬪�糫
-                    var jsonData = new
-                    {
-                        HInterID = _saveObj["Result"]["Result"]["Id"],
-                        HYear = DateTime.Now.Year,
-                        HPeriod = DateTime.Now.Month,
-                        HBillType = 1401,
-                        HBillSubType = 1401,
-                        HDate = _saveObj["Result"]["Result"]["Date"],
-                        HBillNo = _saveObj["Result"]["Result"]["BillNo"],
-                        HBillStatus = _saveObj["Result"]["Result"]["ApproverId_Id"].ToString() == Convert.ToString(0) ? 1 : 2,
-                        HAddress = _saveObj["Result"]["Result"]["ReceiveAddress"],
-                        HSSID = 0,
-                        HSSDate = _saveObj["Result"]["Result"]["Date"],
-                        HCusID = _saveObj["Result"]["Result"]["CustId_Id"],
-                        HCurID = 0,
-                        HExRate = 0,
-                        HEmpID = _saveObj["Result"]["Result"]["SalerId_Id"],
-                        HManagerID = 0,
-                        HDeptID = _saveObj["Result"]["Result"]["SaleDeptId_Id"],
-                        HExplanation = "",
-                        HRemark = "CLOUD瀵煎叆",
-                        HInnerBillNo = _saveObj["Result"]["Result"]["Note"],
-                        HChecker = _saveObj["Result"]["Result"]["ApproverId"]["Name"],
-                        HCheckDate = _saveObj["Result"]["Result"]["ApproveDate"],
-                        HMaker = _saveObj["Result"]["Result"]["CreatorId"]["Name"],
-                        HMakeDate = _saveObj["Result"]["Result"]["CreateDate"],
-                        HCloseMan = _saveObj["Result"]["Result"]["CloserId_Id"],
-                        HCloseDate = _saveObj["Result"]["Result"]["CloseDate"],
-                        HERPInterID = _saveObj["Result"]["Result"]["Id"],
-                        HERPBillType = _saveObj["Result"]["Result"]["BillTypeId_Id"],
-                        HSALEORGID = _saveObj["Result"]["Result"]["SaleOrgId_Id"],
-                        HSALEGROUPID = _saveObj["Result"]["Result"]["SaleGroupId_Id"],
-                        HRECEIVEID = _saveObj["Result"]["Result"]["ReceiveId_Id"],
-                        HSETTLEID = _saveObj["Result"]["Result"]["SettleId_Id"],
-                        HCHARGEID = _saveObj["Result"]["Result"]["ChargeId_Id"],
-                        HHEADLOCID = _saveObj["Result"]["Result"]["HeadLocId_Id"],
-                        HRECCONTACTID = 0,
-                        HCORRESPONDORGID = _saveObj["Result"]["Result"]["CorrespondOrgId_Id"],
-                        HBUSINESSTYPE = _saveObj["Result"]["Result"]["BusinessType"],                      
-                    };
-                    #endregion
-                    // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
-                    sql = $"delete from Xs_SeOrderBillMain where HInterID = " + InterID;
-                    oCN.RunProc(sql);
-
-                    //鎻掑叆涓昏〃
-                    sql = $@"
-                insert into Xs_SeOrderBillMain
-                (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
-	            ,HBillNo,HBillStatus
-	            ,HAddress,HSSID,HSSDate,HCusID,HCurID,HExRate
-	            ,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
-	            ,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate
-	            ,HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID
-	            ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE
-                 )
-                values
-                ({jsonData.HInterID},{jsonData.HYear},{jsonData.HPeriod},{jsonData.HBillType},{jsonData.HBillSubType},
-                '{jsonData.HDate}','{jsonData.HBillNo}',{jsonData.HBillStatus},'{jsonData.HAddress}',{jsonData.HSSID},'{jsonData.HSSDate}',{jsonData.HCusID},
-                {jsonData.HCurID},{jsonData.HExRate},{jsonData.HEmpID},{jsonData.HManagerID},{jsonData.HDeptID},
-                '{jsonData.HExplanation}','{jsonData.HRemark}','{jsonData.HInnerBillNo}','{jsonData.HChecker}','{jsonData.HCheckDate}',
-                '{jsonData.HMaker}','{jsonData.HMakeDate}','{jsonData.HCloseMan}','{jsonData.HCloseDate}',{jsonData.HERPInterID},
-                '{jsonData.HERPBillType}',{jsonData.HSALEORGID},{jsonData.HSALEGROUPID},{jsonData.HRECEIVEID},{jsonData.HSETTLEID},{jsonData.HCHARGEID},
-                {jsonData.HHEADLOCID},{jsonData.HRECCONTACTID},{jsonData.HCORRESPONDORGID},'{jsonData.HBUSINESSTYPE}')";
-
-                    oCN.RunProc(sql);
-
-                    #region [鐢宠瀛愯〃鍙橀噺]
-                    var dataArr = _saveObj["Result"]["Result"]["SaleOrderEntry"];
-
-                    DataSet Cs;
-                    double RelationQty = 0;
-                    #endregion
-                    int i = 0;
-
-                    // 鑾峰彇瀛愯〃鏁版嵁
-                    Cs = oCN.RunProcReturn("select * from Xs_SeOrderBillSub where HInterID = " + InterID, "Xs_SeOrderBillSub");
-                    // 鍒犻櫎瀛愯〃瀵瑰簲鏁版嵁
-                    sql = $"delete from Xs_SeOrderBillSub where HInterID = " + InterID;
-                    oCN.RunProc(sql);
-
-                    foreach (var oSub in dataArr)
-                    {
-                        #region [瀛愯〃鏁版嵁璧嬪�糫
-
-                        if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
-                        {
-                            RelationQty = ClsPub.isDoule(Cs.Tables[0].Rows[i]["HRelationQty"].ToString());
-
-                            i++;
-                        }
-
-                        var subData = new
-                        {
-                            HInterID = _saveObj["Result"]["Result"]["Id"],
-                            HEntryID = oSub["Id"],
-                            HMaterID = oSub["MaterialId_Id"],
-                            HUnitID = oSub["UnitId_Id"],
-                            HQty = oSub["Qty"],
-                            HPrice = oSub["Price"],
-                            HTaxPrice = oSub["TaxPrice"],
-                            HDiscountRate = oSub["DiscountRate"],
-                            HRelTaxPrice = 0,
-                            HMoney = 0,
-                            HTaxRate = oSub["TaxRate"],
-                            HTaxMoney = 0,
-                            HLineTotal = 0,
-                            HlineTotalBB = 0,
-                            HDate = oSub["MinPlanDeliveryDate"],
-                            HOutStockQty = oSub["StockBaseQty"],
-                            HInvoiceQty = 0,
-                            HRemark = oSub["Note"],
-                            HSourceInterID = 0,
-                            HSourceEntryID = 0,
-                            HSourceBillNo = oSub["SrcBillNo"],
-                            HSourceBillType = oSub["SrcType"],
-                            HRelationQty = Convert.ToInt32(oSub["Qty"]) - Convert.ToInt32(oSub["BaseCanOutQty"]),
-                            HPropertyID = 0,
-                            HBatChNo = oSub["Lot_Text"],
-                            HAuxPropID = oSub["AuxPropId_Id"],
-                            HMTONo = oSub["MtoNo"],
-                            HERPInterID = _saveObj["Result"]["Result"]["Id"],
-                            HERPEntryID = oSub["Id"],
-                            HBackRelationQty = Convert.ToInt32(oSub["Qty"]) - Convert.ToInt32(oSub["BaseCanReturnQty"]),
-                            HWhID = oSub["SOStockId_Id"],
-                            HSPID = oSub["SOStockLocalId_Id"],
-                            HSTOCKORGID = oSub["StockOrgId_Id"],
-                            HOWNERID = oSub["OwnerId_Id"],
-                            HOWNERTYPEID = oSub["OwnerTypeId"],
-                            HMAPID = oSub["MapId_Id"],
-                            HSTOCKUNITID = oSub["StockUnitID_Id"],
-                            HBASEUNITID = oSub["BaseUnitId_Id"],
-                            HBFLOWID = oSub["FBFLowId_Id"],
-                            HSETTLEORGID = oSub["SettleOrgId_Id"],
-                            HTAXCOMBINATION = oSub["TaxCombination_Id"],
-                            HPRICEUNITID = oSub["PriceUnitId_Id"],
-                            HISFREE = oSub["IsFree"],
-                            HPRICECOEFFICIENT = oSub["PriceCoefficient"],
-                            HSYSPRICE = oSub["SysPrice"],
-                            HLIMITDOWNPRICE = oSub["LimitDownPrice"],
-                            HPARENTMATID = oSub["ParentMatId_Id"],
-                            HROWTYPE = oSub["RowType"],
-                            HROWID = oSub["RowId"],
-                            HPARENTROWID = oSub["ParentRowId"],
-                            HDELIVERYCONTROL = oSub["DeliveryControl"],
-                            HLOCALCURRID = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["LocalCurrId_Id"],
-                            HEXCHANGETYPEID = oSub["ExchangeTypeId_Id"],
-                            HSETTLECURRID = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["SettleCurrId_Id"],
-                            HSETTLEMODEID = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["SettleModeId_Id"],
-                            HRECCONDITIONID = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["RecConditionId_Id"],
-                            HISINCLUDEDTAX = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["IsIncludedTax"],
-                            HISPRICEEXCLUDETAX = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["IsPriceExcludeTax"],
-                            HEXCHANGERATE = _saveObj["Result"]["Result"]["SaleOrderFinance"][0]["ExchangeRate"],
-                            HTAXRATEID = 0,
-                            HCOSTPERCENT =0,
-                            HVAT = 0,
-                            HSELLERWITHHOLDING = 0,
-                            HBUYERWITHHOLDING = 0,
-                            HPRICELISTENTRY = oSub["PriceListEntry_Id"]                           
-                        };
-                        #endregion                       
-
-                        //鎻掑叆瀛愯〃
-                        sql = $@"
-                 insert into Xs_SeOrderBillSub
-                 (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
-	            ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney
-	            ,HLineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark
-	            ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
-	            ,HRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
-	            ,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID
-	            ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HMAPID,HSTOCKUNITID,HBASEUNITID
-	            ,HBFLOWID,HSETTLEORGID,HTAXCOMBINATION,HPRICEUNITID,HISFREE,HPRICECOEFFICIENT
-	            ,HSYSPRICE,HLIMITDOWNPRICE,HPARENTMATID,HROWTYPE,HROWID,HPARENTROWID
-	            ,HDELIVERYCONTROL,HLOCALCURRID,HEXCHANGETYPEID,HSETTLECURRID,HSETTLEMODEID
-	            ,HRECCONDITIONID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HEXCHANGERATE,HTAXRATEID
-	            ,HCOSTPERCENT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HPRICELISTENTRY
-                 )
-                 values
-                 ({subData.HInterID},{subData.HEntryID},{subData.HMaterID},{subData.HUnitID},{subData.HQty},{subData.HPrice},
-                  {subData.HTaxPrice},{subData.HDiscountRate},{subData.HRelTaxPrice},{subData.HMoney},{subData.HTaxRate},{subData.HTaxMoney},
-                  {subData.HLineTotal},{subData.HlineTotalBB},'{subData.HDate}',{subData.HOutStockQty},{subData.HInvoiceQty},'{subData.HRemark}',
-                  {subData.HSourceInterID},{subData.HSourceEntryID},'{subData.HSourceBillNo}','{subData.HSourceBillType}',{subData.HRelationQty},
-                  {subData.HPropertyID},'{subData.HBatChNo}',{subData.HAuxPropID},'{subData.HMTONo}',{subData.HERPInterID},{subData.HERPEntryID},
-                  {subData.HBackRelationQty},{subData.HWhID},{subData.HSPID},{subData.HSTOCKORGID},{subData.HOWNERID},
-                  '{subData.HOWNERTYPEID}','{subData.HMAPID}',{subData.HSTOCKUNITID},{subData.HBASEUNITID},'{subData.HBFLOWID}',                  
-                  {subData.HSETTLEORGID},{subData.HTAXCOMBINATION},{subData.HPRICEUNITID},'{subData.HISFREE}',
-                  {subData.HPRICECOEFFICIENT},{subData.HSYSPRICE},{subData.HLIMITDOWNPRICE},{subData.HPARENTMATID},'{subData.HROWTYPE}',
-                  '{subData.HROWID}','{subData.HPARENTROWID}','{subData.HDELIVERYCONTROL}',{subData.HLOCALCURRID},'{subData.HEXCHANGETYPEID}',
-                  {subData.HSETTLECURRID},{subData.HSETTLEMODEID},{subData.HRECCONDITIONID},'{subData.HISINCLUDEDTAX}','{subData.HISPRICEEXCLUDETAX}',
-                  {subData.HEXCHANGERATE},{subData.HTAXRATEID},{subData.HCOSTPERCENT},{subData.HVAT},{subData.HSELLERWITHHOLDING},
-                  {subData.HBUYERWITHHOLDING},{subData.HPRICELISTENTRY})";
-
-                        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 閿�鍞鍗曞鏍�/鍙嶅鏍稿姛鑳�
-        [Route("Xs_SeOrderBill/CheckXs_SeOrderBill")]
-        [HttpGet]
-        public object CheckXs_SeOrderBill(string HInterID, int Type, string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Check", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愬鏍�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (string.IsNullOrWhiteSpace(HInterID))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID涓虹┖锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                ClsPub.CurUserName = user;
-                oCN.BeginTran();//寮�濮嬩簨鍔�
-
-                //Type 1 瀹℃牳  2  鍙嶅鏍�
-                if (Type == 1)
-                {
-                    if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                else
-                {
-                    if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
-                        //DataSet DSet = oCn.RunProcReturn("exec h_p_Sc_ICMOBill_AbandonCheckCtrl " + int.Parse(HInterID), "h_p_Sc_ICMOBill_AbandonCheckCtrl");
-                        //if (DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["Hback"]) != 0)
-                        //{
-                        //    objJsonResult.code = "0";
-                        //    objJsonResult.count = 1;
-                        //    objJsonResult.Message = "璇ヤ换鍔″崟宸蹭笅鎺ㄦ祦杞崱锛屼笉鍏佽鍙嶅鏍�" + DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HBackRemark"]);
-                        //    objJsonResult.data = null;
-                        //    return objJsonResult;
-                        //}
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-
-                oCN.Commit();//鎻愪氦浜嬪姟
-
-                objJsonResult.code = "0";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鎵ц鎴愬姛锛�";
-                objJsonResult.data = null;
-                return objJsonResult; ;
-
-            }
-            catch (Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗曞叧闂�/鍙嶅叧闂姛鑳�
-        [Route("Xs_SeOrderBill/CloseXs_SeOrderBill")]
-        [HttpGet]
-        public object CloseXs_SeOrderBill(string HInterID, int Type, string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Close", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (string.IsNullOrWhiteSpace(HInterID))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID涓虹┖锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                ClsPub.CurUserName = user;
-
-                oCN.BeginTran();//寮�濮嬩簨鍔�
-
-                //Type 1 鍏抽棴  2  鍙嶅叧闂�
-                if (Type == 1)
-                {
-                    if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                else
-                {
-                    if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-
-                oCN.Commit();//鎻愪氦浜嬪姟
-
-                objJsonResult.code = "0";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鎵ц鎴愬姛锛�";
-                objJsonResult.data = null;
-                return objJsonResult; ;
-
-            }
-            catch (Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗曚綔搴�/鍙嶄綔搴熷姛鑳�
-        [Route("Xs_SeOrderBill/CancellXs_SeOrderBill")]
-        [HttpGet]
-        public object CancellXs_SeOrderBill(string HInterID, int Type, string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Delete", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (string.IsNullOrWhiteSpace(HInterID))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID涓虹┖锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                ClsPub.CurUserName = user;
-
-                oCN.BeginTran();//寮�濮嬩簨鍔�
-
-                //Type 1 浣滃簾  2  鍙嶄綔搴�
-                if (Type == 1)
-                {
-                    if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                else
-                {
-                    if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-
-                oCN.Commit();//鎻愪氦浜嬪姟
-
-                objJsonResult.code = "0";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鎵ц鎴愬姛锛�";
-                objJsonResult.data = null;
-                return objJsonResult; ;
-
-            }
-            catch (Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-
-
-        #region 閿�鍞鍗曚繚瀛� 鏂板/缂栬緫
-        [Route("Xs_SeOrderBill/SaveXs_SeOrderBill")]
-        [HttpPost]
-        public object SaveXs_SeOrderBill([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();                             //瀛愯〃1鏁版嵁
-            string refSav = sArray[2].ToString();                           //鎿嶄綔鏂瑰紡
-            string msg4 = sArray[3].ToString();                             //鐢ㄦ埛
-
-            DBUtility.ClsPub.CurUserName = msg4;
-
-            string UserName = "";
-            string s = "";
-            ListModels oListModels = new ListModels();
-            try
-            {
-                //缂栬緫鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log_second("Xs_SeOrderBill_Edit", 1, false, msg4))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();
-                List<Model.ClsXs_SeOrderBillMain> lsmain = new List<Model.ClsXs_SeOrderBillMain>();
-                msg2 = msg2.Replace("\\", "");
-                msg2 = msg2.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Xs_SeOrderBillMain(msg2);
-                foreach (Model.ClsXs_SeOrderBillMain oItem in lsmain)
-                {
-                    if (refSav == "Add")
-                    {
-                        //鍗曟嵁鍙锋槸鍚﹂噸澶�
-                        if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                    }
-                    if (refSav == "Update")
-                    {
-                        if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                        //鍒ゆ柇鏄惁鍙紪杈�
-                        if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                        if (BillOld.omodel.HBillStatus > 1)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                        if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-
-                        string sql = "select count(*) Xs_ExceptiveCheckRequestBillCount from Xs_ExceptiveCheckRequestBillMain where HMainSourceInterID = " + BillOld.omodel.HInterID;
-                        ds = oCN.RunProcReturn(sql, "Xs_ExceptiveCheckRequestBillMain");
-                        if (ds != null && Int64.Parse(ds.Tables[0].Rows[0]["Xs_ExceptiveCheckRequestBillCount"].ToString()) > 0)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "淇濆瓨澶辫触锛屽崟鎹瓨鍦ㄤ笅娓稿崟鎹甗鐗规壒鐢宠鍗昡锛�";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                    }
-                    UserName = oItem.HMaker;  //鍒跺崟浜�
-                    oItem.HBillType = "1401";
-                    //oItem.HBillSubType = "1401";
-                    oItem.HSALEORGID = oItem.HOrgID;
-
-                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
-                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
-                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
-
-                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    oBill.omodel = oItem;
-                }
-                //琛ㄤ綋鏁版嵁
-                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
-                msg3 = msg3.Substring(1, msg3.Length - 2);
-                msg3 = msg3.Replace("\\", "");
-                msg3 = msg3.Replace("\n", "");  //\n
-                //msg2 = msg2.Replace("'", "鈥�");
-                List<Model.ClsXs_SeOrderBillSub> ls = new List<Model.ClsXs_SeOrderBillSub>();
-                ls = oListModels.getObjectByJson_Xs_SeOrderBillSub(msg3);
-                int i = 0;
-                foreach (Model.ClsXs_SeOrderBillSub oItemSub in ls)
-                {
-                    i++;
-                    oItemSub.HEntryID = i;
-
-                    //oItemSub.HCloseMan = "";       //琛屽叧闂�
-                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
-                    oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
-                    //oItemSub.HRemark = "";         //澶囨敞
-
-                    //oItemSub.HSourceInterID = 0;     // 婧愬崟涓诲唴鐮�
-                    //oItemSub.HSourceEntryID = 0;   //婧愬崟瀛愬唴鐮�
-                    //oItemSub.HSourceBillNo = "";  //婧愬崟鍗曞彿
-                    //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
-                    //oItemSub.HRelationQty = 0;     //鍏宠仈鏁伴噺
-                    //oItemSub.HRelationMoney = 0;   //鍏宠仈閲戦 
-
-                    if (oItemSub.HMaterID != 0)
-                    {
-                        oBill.DetailColl.Add(oItemSub);
-                    }
-                }
-                //淇濆瓨
-                //淇濆瓨瀹屾瘯鍚庡鐞�
-                bool bResult;
-                if (refSav == "Add")
-                {
-                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                }
-                else if (refSav == "Update")
-                {
-                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-                }
-                else
-                {
-                    bResult = false;
-                }
-                if (bResult)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
-                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
-                    objJsonResult.data = 1;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
-                    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("Xs_SeOrderBill/loadXs_SeOrderBill_Edit")]
-        [HttpGet]
-        public object loadXs_SeOrderBill_Edit(long HInterID)
+        public object cx(long HInterID)
         {
             try
             {
 
-                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
+                ds = oCN.RunProcReturn("select * from h_v_Xs_ContractBillAllList where hmainid =" + HInterID, "h_v_Xs_ContractBillAllList");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -1297,137 +542,41 @@
         }
         #endregion
 
-        #region 閿�鍞鍗� 鍒犻櫎
-        [Route("Xs_SeOrderBill/DropXs_SeOrderBill")]
+
+        #region 鏍规嵁鐗╂枡鍐呯爜鑾峰彇鐗╂枡淇℃伅
+        [Route("Xs_ContractBill/getMaterialByMaterID")]
         [HttpGet]
-        public object dropXs_SeOrderBill(string HInterID, string user)
+        public ApiResult<DataTable> getMaterialByMaterID(Int64 HMaterID)
         {
-            try
-            {
-                string s = "";
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
 
-                //鏌ョ湅鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Drop", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+            string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
+                " from Gy_Material AS a " +
+                " LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
+                " where a.HItemID =" + HMaterID;
 
-                if (HInterID == null || HInterID.Equals(""))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
-                    objJsonResult.data = 1;
-                    return objJsonResult;
-                }
-                //鍒ゆ柇鏄惁鍙紪杈�
-                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
-                    objJsonResult.data = 1;
-                    return objJsonResult;
-                }
-
-                //鍒犻櫎鍓嶆帶鍒�=========================================      
-                string sql1 = "exec h_p_Xs_SeOrderBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
-                ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOrderBill_BeforeDelCtrl");
-                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                //==================================================================================      
-
-                oCN.BeginTran();
-
-                oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
-                oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
-
-                //鍒犻櫎鍚庢帶鍒�==================================================================================      
-                string sql2 = "exec h_p_Xs_SeOrderBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
-                ds = oCN.RunProcReturn(sql2, "h_p_Xs_SeOrderBill_AfterDelCtrl");
-                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
-                {
-                    s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
-                    objJsonResult.data = null;
-                    oCN.RollBack();
-                    return objJsonResult;
-                }
-                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
-                {
-                    s = ds.Tables[0].Rows[0]["HRemark"].ToString();
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
-                    objJsonResult.data = null;
-                    oCN.RollBack();
-                    return objJsonResult;
-                }
-                //==============================================================================================
+            var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
 
 
-                oCN.Commit();
+            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+                return new ApiResult<DataTable> { code = -1, msg = "涓嶅瓨鍦ㄨ鐗╂枡" };
 
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勯攢鍞鍗曪紒";
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-            catch (Exception e)
-            {
-                oCN.RollBack();
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
+            return new ApiResult<DataTable> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet.Tables[0] };
         }
         #endregion
 
-        #region 閿�鍞鍗� 瀹℃牳/鍙嶅鏍�
+        #region 閿�鍞悎鍚� 瀹℃牳/鍙嶅鏍�
         /// <summary>
         /// </summary>
         /// <param name="HInterID">鍗曟嵁ID</param>
         /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
         /// <param name="CurUserName">瀹℃牳浜�</param>
         /// <returns></returns>
-        [Route("Xs_SeOrderBill/AuditXs_SeOrderBill")]
+        [Route("Xs_ContractBill/AuditXs_ContractBill")]
         [HttpGet]
-        public object AuditXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
+        public object AuditXs_ContractBill(int HInterID, int IsAudit, string CurUserName)
         {
-            string ModRightNameCheck = "Xs_SeOrderBill_Check";
+            string ModRightNameCheck = "Xs_ContractBill_Check";
             DBUtility.ClsPub.CurUserName = CurUserName;
             try
             {
@@ -1453,7 +602,7 @@
 
                 Int64 lngBillKey = 0;
                 lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();                              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+                DAL.ClsXs_ContractBill oBill = new DAL.ClsXs_ContractBill();                              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
 
                 //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
                 if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
@@ -1495,18 +644,6 @@
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
-
-                        foreach(Model.ClsXs_SeOrderBillSub oSub in oBill.DetailColl)
-                        {
-                            if (oSub.HCloseMan != "")
-                            {
-                                objJsonResult.code = "0";
-                                objJsonResult.count = 0;
-                                objJsonResult.Message = "鍗曟嵁涓瓨鍦ㄨ鍏抽棴鐨勮褰�!鍙嶅鏍稿け璐ワ紒";
-                                objJsonResult.data = null;
-                                return objJsonResult;
-                            }
-                        }
                     }
                 }
                 else
@@ -1522,19 +659,10 @@
                 //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
                 if (IsAudit == 0) //瀹℃牳鎻愪氦
                 {
-                    ds = oCN.RunProcReturn("exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HInterID, "h_p_Kf_CheckSeOrderBill_CrediControl");
-                    if(ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
 
                     //瀹℃牳鍓嶆帶鍒�=========================================      
-                    string sql1 = "exec h_p_Xs_SeOrderBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
-                    ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOrderBill_BeforeCheckCtrl");
+                    string sql1 = "exec h_p_Xs_ContractBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+                    ds = oCN.RunProcReturn(sql1, "h_p_Xs_ContractBill_BeforeCheckCtrl");
                     if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
@@ -1555,7 +683,7 @@
                     //==================================================================================      
 
                     //瀹℃牳鎻愪氦
-                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_ContractBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                     {
                         objJsonResult.code = "1";
                         objJsonResult.count = 1;
@@ -1575,7 +703,7 @@
                 if (IsAudit == 1) //鍙嶅鏍告彁浜�
                 {
                     //鍙嶅鏍稿墠鎺у埗=========================================
-                    DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOrderBill_BeforeAbandonCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Xs_SeOrderBill_BeforeAbandonCheckCtrl");
+                    DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_ContractBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Xs_ContractBill_BeforeUnCheckCtrl");
                     if (ds == null)
                     {
                         objJsonResult.code = "0";
@@ -1595,7 +723,7 @@
                     //=========================================================
 
                     //鍙嶅鏍告彁浜bandonCheck
-                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_ContractBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                     {
                         objJsonResult.code = "1";
                         objJsonResult.count = 1;
@@ -1625,280 +753,84 @@
         }
         #endregion
 
-        #region 閿�鍞鍗� 鍏抽棴/鍙嶅叧闂�
-        /// <summary>
-        /// </summary>
-        /// <param name="HInterID">鍗曟嵁ID</param>
-        /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
-        /// <param name="CurUserName">鍏抽棴浜�</param>
-        /// <returns></returns>
-        [Route("Xs_SeOrderBill/CloseXs_SeOrderBill_1")]
+        #region 閿�鍞悎鍚� 鍏抽棴/鍙嶅叧闂姛鑳�
+        [Route("Xs_ContractBill/CloseXs_ContractBill")]
         [HttpGet]
-        public object CloseXs_SeOrderBill_1(int HInterID, int IsAudit, string CurUserName)
+        public object CloseXs_ContractBill(string HInterID, int Type, string user)
         {
-            string ModRightNameCheck = "Xs_SeOrderBill_Close";
-            DBUtility.ClsPub.CurUserName = CurUserName;
-            string sql = "";
             try
             {
-                //妫�鏌ユ潈闄�
-                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+                //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Xs_ContractBill_Close", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                //HInterID鏁版嵁鍒ゆ柇
-                if (HInterID <= 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID灏忎簬0锛�";
+                    objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
 
-
-                Int64 lngBillKey = 0;
-                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
-
-                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
-                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
-                {
-                    if (oBill.omodel.HDeleteMan.Trim() != "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    if (oBill.omodel.HChecker.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    if (IsAudit == 0)  //鍏抽棴鍒ゆ柇
-                    {
-                        if (oBill.omodel.HCloseMan.Trim() != "")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-                    }
-                    if (IsAudit == 1) //鍙嶅叧闂垽鏂�
-                    {
-                        if (oBill.omodel.HCloseMan.Trim() == "")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-
-                        //鍒ゆ柇鍗曟嵁鏄惁涓鸿嚜鍔ㄥ叧闂�
-                        sql = "select * from Xs_SeOrderBillMain where HInterID = " + HInterID;
-                        ds = oCN.RunProcReturn(sql, "Xs_SeOrderBillMain");
-                        if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "鍙嶅叧闂け璐�!鍗曟嵁涓鸿嚜鍔ㄥ叧闂紝涓嶈兘杩涜鎵嬪姩鍙嶅叧闂紒";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-                    }
-                }
-                else
+                if (string.IsNullOrWhiteSpace(HInterID))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.Message = "HInterID涓虹┖锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
 
+                ClsPub.CurUserName = user;
+                BillOld.MvarItemKey = "Xs_ContractBillMain";
+                oCN.BeginTran();//寮�濮嬩簨鍔�
 
-                //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
-                if (IsAudit == 0) //鍏抽棴鎻愪氦
+                //Type 1 鍏抽棴  2  鍙嶅叧闂�
+                if (Type == 1)
                 {
-                    //鍏抽棴鎻愪氦
-                    if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍏抽棴鎴愬姛";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                if (IsAudit == 1) //鍙嶅叧闂彁浜�
-                {
-                    ds = oCN.RunProcReturn("exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HInterID, "h_p_Kf_CheckSeOrderBill_CrediControl");
-                    if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    //鍙嶅叧闂彁浜�
-                    if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶅叧闂垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                return objJsonResult;
-            }
-            catch (Exception e)
-            {
-                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="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
-        /// <param name="CurUserName">鍏抽棴浜�</param>
-        /// <returns></returns>
-        [Route("Xs_SeOrderBill/CloseRowXs_SeOrderBill")]
-        [HttpGet]
-        public object CloseRowXs_SeOrderBill(int HInterID,int HEntryID, int IsAudit, string CurUserName)
-        {
-            string ModRightNameCheck = "Xs_SeOrderBill_Close";
-            string SubBillName = "Xs_SeOrderBillSub";                   //瀛愯〃琛ㄥ悕
-            DBUtility.ClsPub.CurUserName = CurUserName;
-            DataSet ds = null;
-            try
-            {
-                //妫�鏌ユ潈闄�
-                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "琛屽叧闂け璐ワ紒鏃犳潈闄愶紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                //HInterID鏁版嵁鍒ゆ柇
-                if (HInterID <= 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID灏忎簬0锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                Int64 lngBillKey = 0;
-                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
-
-                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
-                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
-                {
-                    if (oBill.omodel.HDeleteMan.Trim() != "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜琛屽叧闂紒";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    if (oBill.omodel.HCloseMan.Trim() != "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜琛屽叧闂紒";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    if (oBill.omodel.HChecker.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜琛屽叧闂紒";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-
-                    string sql = "select * from " + SubBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
-                    ds = oCN.RunProcReturn(sql, "Xs_SeOrderBillSub");
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+                    DataSet ds;
+                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "璇ヨ鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
-                    if (IsAudit == 0)  //琛屽叧闂垽鏂�
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
-                        if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒";
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
-                    }
-                    if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇
-                    {
-                        if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
+                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
 
-                        //鍒ゆ柇琛屾槸鍚︿负鑷姩鍏抽棴
-                        string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
-                        if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
+                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍏抽棴鍗曟嵁
+                        if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
@@ -1906,149 +838,362 @@
                 }
                 else
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-
-                //杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔
-                if (IsAudit == 0) //琛屽叧闂彁浜�
-                {
-                    //琛屽叧闂彁浜�
-                    if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+                    DataSet ds;
+                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "琛屽叧闂垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "琛屽叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦
-                {
-                    oBill.oCn.BeginTran();
-                    //琛屽弽鍏抽棴鎻愪氦
-                    if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-                    {
-                        ds = oCN.RunProcReturn("exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HInterID, "h_p_Kf_CheckSeOrderBill_CrediControl");
-                        if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
                             objJsonResult.data = null;
-                            oBill.oCn.RollBack();
                             return objJsonResult;
                         }
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶅叧闂垚鍔�";
-                        objJsonResult.data = null;
-                        oBill.oCn.Commit();
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        oBill.oCn.RollBack();
-                        return objJsonResult;
+                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶅叧闂崟鎹�
+                        if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
                     }
                 }
-                return objJsonResult;
+
+                oCN.Commit();//鎻愪氦浜嬪姟
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎵ц鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult; ;
+
             }
             catch (Exception e)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+                objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
         }
         #endregion
 
-        #region 閿�鍞鍗� 浣滃簾/鍙嶄綔搴�
+        #region 閿�鍞悎鍚� 琛屽叧闂�/琛屽弽鍏抽棴锛堟湭瀹屽杽锛�
         /// <summary>
         /// </summary>
         /// <param name="HInterID">鍗曟嵁ID</param>
-        /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
-        /// <param name="CurUserName">浣滃簾浜�</param>
+        /// <param name="HEntryID2">瀛愬唴鐮佷粯娆捐鍒�</param>
+        /// <param name="HEntryID">瀛愬唴鐮佺墿鏂欐槑缁�</param>
+        /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
+        /// <param name="CurUserName">鍏抽棴浜�</param>
         /// <returns></returns>
-        [Route("Xs_SeOrderBill/DeleteXs_SeOrderBill")]
+        //[Route("Xs_ContractBill/CloseRowXs_ContractBill")]
+        //[HttpGet]
+        //public object CloseRowXs_ContractBill(int HInterID, int HEntryID, int HEntryID2, int IsAudit, string CurUserName)
+        //{
+        //    string ModRightNameCheck = "Xs_ContractBill_Close";
+        //    string SubBillName = "Xs_ContractBillSub";
+        //    string SchemeBillName = "Xs_ContractBillScheme";   //瀛愯〃琛ㄥ悕
+        //    DBUtility.ClsPub.CurUserName = CurUserName;
+        //    DataSet ds = null;
+        //    try
+        //    {
+        //        //妫�鏌ユ潈闄�
+        //        if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "琛屽叧闂け璐ワ紒鏃犳潈闄愶紒";
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //        //HInterID鏁版嵁鍒ゆ柇
+        //        if (HInterID <= 0)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "HInterID灏忎簬0锛�";
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+
+        //        Int64 lngBillKey = 0;
+        //        lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+        //        DAL.ClsXs_ContractBill oBill = new DAL.ClsXs_ContractBill();              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+        //        //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+        //        if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+        //        {
+        //            //鍒ゆ柇鍗曟嵁鏉′欢
+        //            if (oBill.omodel.HDeleteMan.Trim() != "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜琛屽叧闂紒";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            if (oBill.omodel.HCloseMan.Trim() != "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜琛屽叧闂紒";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            if (oBill.omodel.HChecker.Trim() == "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜琛屽叧闂紒";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            //鍒ゆ柇鐗╂枡鏄庣粏琛ㄦ潯浠�
+        //            string sql = "select * from " + SubBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
+        //            ds = oCN.RunProcReturn(sql, "Xs_ContractBillSub");
+        //            if (ds == null || ds.Tables[0].Rows.Count == 0)
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "璇ョ墿鏂欒鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            if (IsAudit == 0)  //琛屽叧闂垽鏂�
+        //            {
+        //                if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "鐗╂枡琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //            if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇
+        //            {
+        //                if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "鐗╂枡琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+
+        //                //鍒ゆ柇琛屾槸鍚︿负鑷姩鍏抽棴
+        //                string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
+        //                if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "鐗╂枡琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //            //鍒ゆ柇浠樻璁″垝琛ㄦ潯浠�
+        //            sql = "select * from " + SchemeBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID2;
+        //            ds = oCN.RunProcReturn(sql, "Xs_ContractBillScheme");
+        //            if (ds == null || ds.Tables[0].Rows.Count == 0)
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "璇ヨ鍒掕鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            if (IsAudit == 0)  //琛屽叧闂垽鏂�
+        //            {
+        //                if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "璁″垝琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //            if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇
+        //            {
+        //                if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "璁″垝琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+
+        //                //鍒ゆ柇琛屾槸鍚︿负鑷姩鍏抽棴
+        //                string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
+        //                if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "璁″垝琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //        }
+        //        else
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+
+        //        oCN.BeginTran();//寮�鍚簨鍔�
+        //        //杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔
+        //        if (IsAudit == 0) //琛屽叧闂彁浜�
+        //        {
+        //            //琛屽叧闂彁浜�
+        //            if (oBill.CloseRow(lngBillKey, HEntryID, HEntryID2, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+        //            {
+        //                objJsonResult.code = "1";
+        //                objJsonResult.count = 1;
+        //                objJsonResult.Message = "琛屽叧闂垚鍔�";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            else
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "琛屽叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //        }
+        //        if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦
+        //        {
+        //            //琛屽弽鍏抽棴鎻愪氦
+        //            if (oBill.CancelRow(lngBillKey, HEntryID, HEntryID2, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+        //            {
+        //                objJsonResult.code = "1";
+        //                objJsonResult.count = 1;
+        //                objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //            else
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+        //                objJsonResult.data = null;
+        //                return objJsonResult;
+        //            }
+        //        }
+        //        oCN.Commit();
+        //        return objJsonResult;
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+        //        objJsonResult.data = null;
+        //        return objJsonResult;
+        //    }
+        //}
+        #endregion
+
+        #region 閿�鍞悎鍚� 浣滃簾/鍙嶄綔搴熷姛鑳�
+        [Route("Xs_ContractBill/DropXs_ContractBill")]
         [HttpGet]
-        public object DeleteXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
+        public object DropXs_ContractBill(string HInterID, int Type, string user)
         {
-            string ModRightNameCheck = "Xs_SeOrderBill_Delete";
-            DBUtility.ClsPub.CurUserName = CurUserName;
             try
             {
-                //妫�鏌ユ潈闄�
-                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+                //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Xs_ContractBill_Drop", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                //HInterID鏁版嵁鍒ゆ柇
-                if (HInterID <= 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID灏忎簬0锛�";
+                    objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
 
-
-                Int64 lngBillKey = 0;
-                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
-
-                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
-                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+                if (string.IsNullOrWhiteSpace(HInterID))
                 {
-                    if (oBill.omodel.HChecker.Trim() != "")
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                ClsPub.CurUserName = user;
+                BillOld.MvarItemKey = "Xs_ContractBillMain";
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+
+                //Type 1 浣滃簾  2  鍙嶄綔搴�
+                if (Type == 1)
+                {
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+                    DataSet ds;
+                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
-                    if (IsAudit == 0)  //浣滃簾鍒ゆ柇
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
-                        if (oBill.omodel.HDeleteMan.Trim() != "")
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
-                    }
-                    if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
-                    {
-                        if (oBill.omodel.HDeleteMan.Trim() == "")
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
-                            objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
@@ -2056,512 +1201,58 @@
                 }
                 else
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+                    DataSet ds;
+                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶄綔搴熷崟鎹�
+                        if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
                 }
 
+                oCN.Commit();//鎻愪氦浜嬪姟
 
-                //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
-                if (IsAudit == 0) //浣滃簾鎻愪氦
-                {
-                    //浣滃簾鎻愪氦
-                    if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "浣滃簾鎴愬姛";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                if (IsAudit == 1) //鍙嶅叧闂彁浜�
-                {
-                    //鍙嶅叧闂彁浜�
-                    if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                }
-                return objJsonResult;
-            }
-            catch (Exception e)
-            {
                 objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮�
-        [Route("Xs_SeOrderBill/getCustomerByCusID")]
-        [HttpGet]
-        public object getCustomerByCusID(long HCusID)
-        {
-            try
-            {
-                string sql = @"select 
-                            c.HItemID HCusID
-                            ,c.HNumber HCusNumber
-                            ,c.HName HCusName
-                            ,c.HSSID
-                            ,s.HName HSSName
-                            ,c.HCurID
-                            ,cur.HName HCurName
-                            ,cur.HExchangeRate HExRate
-                            ,c.HTaxRate
-							,c.HLinkMan
-							,c.HLinkPhone
-							,c.HMobilePhone
-							,ISNULL(cre.HCreditRating_Now,0) HCreditRating_Now
-                            from Gy_Customer as c 
-                            left join Gy_SettleStyle as s on c.HSSID = s.HItemID
-                            left join Gy_Currency as cur on c.HCurID = cur.HItemID
-							left join Gy_Customer_Credit as cre on c.HItemID = cre.HCusID
-                            where c.HItemID = " + HCusID;
-                ds = oCN.RunProcReturn(sql,"Gy_Customer");
-
-
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏈煡璇㈠埌璇ュ鎴蜂俊鎭紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鏍规嵁鐢ㄦ埛鑾峰彇閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠�
-        [Route("Xs_SeOrderBill/getCzyglByUser")]
-        [HttpGet]
-        public object getCzyglByUser(string CurUserName)
-        {
-            try
-            {
-                string sql = @"select 
-                            ISNULL(c.HEmpID,0) HEmpID
-                            ,e.HName HEmpName
-                            ,ISNULL(c.HDeptID,0) HDeptID
-                            ,d.HName HDeptName
-                            ,ISNULL(d.HEmpID,0) HManagerID
-                            ,e1.HName HManagerName
-                            from Gy_Czygl as c
-                            left join Gy_Employee as e on c.HEmpID = e.HItemID
-                            left join Gy_Department as d on c.HDeptID = d.HItemID
-                            left join Gy_Employee as e1 on d.HEmpID = e1.HItemID
-                            where c.Czymc = '" + CurUserName + "'";
-                ds = oCN.RunProcReturn(sql, "Gy_Czygl");
-
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏈煡璇㈠埌璇ョ敤鎴蜂俊鎭紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛杩囨护鏉′欢
-        [Route("Xs_SeOrderBill/getCusIDListByUser")]
-        [HttpGet]
-        public object getCusIDListByUser(string CurUserID, string CurUserName)
-        {
-            string sWhere = "";
-            string ModRightNameCheck = "Gy_UserLookAllCus";
-            DBUtility.ClsPub.CurUserName = CurUserName;
-            try
-            {
-                //鏉冮檺鍒ゆ柇锛氭槸鍚﹀彲浠ユ煡鐪嬫墍鏈夊鎴�
-                if (DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
-                {
-                    sWhere = "";
-                }
-                else
-                {
-                    sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "' union all select 166351 hcusid)";
-                }
-
-                objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "Sucess锛�";
-                objJsonResult.data = sWhere;
-                return objJsonResult;
-            }
-            catch (Exception e)
-            {
-                sWhere = " and 1=0 ";
-
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
-                objJsonResult.data = sWhere;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 涓嬫帹鐢熶骇璁㈠崟(鏃犲垪琛�)-鑾峰彇鏁版嵁
-        [Route("Xs_SeOrderBill/loadXs_SeOrderBill_InitICMO")]
-        [HttpGet]
-        public object loadXs_SeOrderBill_InitICMO(long HInterID,long HEntryID)
-        {
-            try
-            {
-                string sql = "select * from h_v_IF_SeOrderBillList where hmainid = " + HInterID + " and HSubID = " + HEntryID;
-                ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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.Message = "鎵ц鎴愬姛锛�";
                 objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
+                return objJsonResult; ;
 
-        #region 閿�鍞鍗� 妫�鏌ュ崟鎹槸鍚﹀瓨鍦�
-        /// <summary>
-        /// </summary>
-        /// <param name="HInterID">鍗曟嵁ID</param>
-        /// <returns></returns>
-        [Route("Xs_SeOrderBill/CheckSeOrderBill_IsExist")]
-        [HttpGet]
-        public object CheckSeOrderBill_IsExist(int HInterID)
-        {
-            try
-            {
-                //HInterID鏁版嵁鍒ゆ柇
-                if (HInterID <= 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "HInterID灏忎簬0锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                Int64 lngBillKey = 0;
-                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
-                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();                              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
-
-                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
-                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍗曟嵁瀛樺湪";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
             }
             catch (Exception e)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "绋嬪簭閿欒锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 涓嬫煡
-        /// <summary>
-        /// </summary>
-        /// <param name="HInterID">鍗曟嵁ID</param>
-        /// <returns></returns>
-        [Route("Xs_SeOrderBill/SeOrderBill_LookDown")]
-        [HttpGet]
-        public object SeOrderBill_LookDown(int HInterID)
-        {
-            try
-            {
-                List<object> columnNameListSum = new List<object>();
-                List<object> columnNameList0 = new List<object>();
-                List<object> columnNameList1 = new List<object>();
-                List<object> columnNameList2 = new List<object>();
-                List<object> columnNameList3 = new List<object>();
-                List<object> columnNameList4 = new List<object>();
-
-                string sql = "exec h_p_Xs_SeOrderBill_lookdown " + HInterID;
-                ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");
-
-                //娣诲姞 閿�鍞鍗曞彉鏇村崟 鍒楀悕
-                foreach (DataColumn col in ds.Tables[0].Columns)
-                {
-                    Type dataType = col.DataType;
-                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-
-                //娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
-                foreach (DataColumn col in ds.Tables[1].Columns)
-                {
-                    Type dataType = col.DataType;
-                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-
-                //娣诲姞 鐗规壒鐢宠鍗� 鍒楀悕
-                foreach (DataColumn col in ds.Tables[2].Columns)
-                {
-                    Type dataType = col.DataType;
-                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-
-                //娣诲姞 閿�鍞嚭搴撳崟 鍒楀悕
-                foreach (DataColumn col in ds.Tables[3].Columns)
-                {
-                    Type dataType = col.DataType;
-                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-
-                //娣诲姞 宸ュ簭娴佽浆鍗� 鍒楀悕
-                foreach (DataColumn col in ds.Tables[4].Columns)
-                {
-                    Type dataType = col.DataType;
-                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-
-                columnNameListSum.Add(columnNameList0);
-                columnNameListSum.Add(columnNameList1);
-                columnNameListSum.Add(columnNameList2);
-                columnNameListSum.Add(columnNameList3);
-                columnNameListSum.Add(columnNameList4);
-
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "Sucess锛�";
-                objJsonResult.data = ds.Tables;
-                objJsonResult.list = columnNameListSum;
-                return objJsonResult;
-            }
-            catch (Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栭攢鍞鍗曟暟鎹�
-        [Route("Xs_SeOrderBill/loadXs_SeOrderBill_Push")]
-        [HttpGet]
-        public object loadXs_SeOrderBill_Push(long HInterID,long HSubID)
-        {
-            try
-            {
-
-                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_SeOrderBillList");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬銆佷富绠�
-        [Route("Xs_SeOrderBill/getEmpInfoByHEmpID")]
-        [HttpGet]
-        public object getEmpInfoByHEmpID(long HEmpID)
-        {
-            try
-            {
-                string sql = "select a.HItemID HEmpID,a.HName HEmpName,ISNULL(a.HDeptID,0) HDeptID,b.HName HDeptName,ISNULL(b.HEmpID,0) HManagerID,c.HName HManagerName " +
-                    " from Gy_Employee as a " +
-                    " left join Gy_Department as b on a.HDeptID = b.HItemID " +
-                    " left join Gy_Employee as c on b.HEmpID = c.HItemID " +
-                    " where a.HItemID = " + HEmpID;
-                ds = oCN.RunProcReturn(sql, "Gy_Employee");
-
-
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏈煡璇㈠埌璇ヨ亴鍛樹俊鎭紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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;
-            }
-        }
-        #endregion
-
-        #region 閿�鍞鍗� 鑾峰彇鎺掑簭鍚庣殑鏁版嵁
-        [Route("Xs_SeOrderBill/sortList")]
-        [HttpGet]
-        public object sortList(string sWhere, string user)
-        {
-            try
-            {
-                //鍒ゆ柇鏌ヨ鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList order by hmainid desc", "h_v_IF_SeOrderBillList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
-                    ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
-                }
-
-                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.Message = "鎵ц澶辫触锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
         }
         #endregion
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1