增加休息日后端保存和批量保存

zrg

2024-07-16 908a189a83797f2e2037aa55f1841d2496137672

增加休息日后端保存和批量保存

 Model/Model.csproj

@@ -138,6 +138,7 @@
    <Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
    <Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
    <Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RestDay_Model.cs" />
    <Compile Include="质检管理\ClsQC_TakeSampleCheckBillMain.cs" />
    <Compile Include="质检管理\ClsQC_TakeSampleCheckBillSub.cs" />
    <Compile Include="MES\ClsSc_SourceLineRepairBillSub_Mater.cs" />

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_RestDay_Model.cs

New file
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsGy_RestDay_Model : DBUtility.ClsGy_Base_Model
    {
        public DateTime HRestDay;
        public int HOrgID;
        public int HDeptID;
        public string HWeekDay;
    }
}

 WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs

@@ -6808,5 +6808,247 @@
            }
        }
        #endregion

        #region  ä¼‘息日  æŸ¥è¯¢,审核，反审核，禁用，反禁用
        /// <summary> 
        /// ä¼‘息日  æŸ¥è¯¢
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Gy_BadReason/Gy_RestDayList")]
        [HttpGet]
        public object Gy_RestDayList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql1 = "select * from  h_v_Gy_RestDay where 1 = 1";
                string sql = sql1 + sWhere + " order by ä¼‘息日代码 ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RestDay");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// ä¼‘息日 å®¡æ ¸ã€åå®¡æ ¸
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_BadReason/AuditGy_RestDay")]
        [HttpGet]
        public object AuditGy_RestDay(int HInterID, int IsAudit, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_RestDay_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_RestDay where HItemID=" + HInterID, "Gy_RestDay");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
                    {
                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                if (IsAudit == 0)  //审核判断
                {
                    oCN.RunProc("update Gy_RestDay set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    oCN.RunProc("update Gy_RestDay set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反审核成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        /// <summary>
        /// ä¼‘息日 ç¦ç”¨ã€åç¦ç”¨
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsStop">禁用(0),反禁用(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Gy_BadReason/StopGy_RestDay")]
        [HttpGet]
        public object StopGy_RestDay(int HInterID, int IsStop, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_RestDay_Close", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "禁用失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var ds = oCN.RunProcReturn("select * from Gy_RestDay where HItemID=" + HInterID, "Gy_SupType");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsStop == 0)  //禁用判断
                    {
                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已禁用!不能再次禁用！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsStop == 1) //反禁用判断
                    {
                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未禁用!不需要反禁用!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                if (IsStop == 0)  //禁用判断
                {
                    oCN.RunProc("update Gy_RestDay set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "禁用成功";
                    objJsonResult.data = null;
                }
                if (IsStop == 1) //反禁用判断
                {
                    oCN.RunProc("update Gy_RestDay set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反禁用成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();

                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "禁用失败或者反禁用失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/WebAPIController.cs

@@ -150,21 +150,21 @@
        /// <returns></returns>
        [Route("Web/GetMAXNumber")]
        [HttpGet]
        public object GetMAXNumber(string HBillType,string HName,string TableName)
        public object GetMAXNumber(string HBillType, string HName, string TableName)
        {
            try
            {
                string HNumber = "";
                HNumber = DBUtility.ClsPub.CreateHNumber(HBillType,HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
                HNumber = DBUtility.ClsPub.CreateHNumber(HBillType, HName, TableName, ref DBUtility.ClsPub.sExeReturnInfo, true);
                //----------创建虚表------------------------
                DataTable dt_Main = new DataTable("Json");
                dt_Main.Columns.Add("HNumber", typeof(string));
              

                //---------创建新行------------------------
                DataRow dr_main = dt_Main.NewRow();//创建新行 
                dt_Main.Rows.Add(dr_main);//将新行加入到表中
                dr_main["HNumber"] = DBUtility.ClsPub.isStrNull(HNumber);
              


                if (HNumber == null)
                {
@@ -252,7 +252,7 @@
        public object GetUser(string UserName, string PassWord, string HOrgName)
        {
            try
            {                              
            {
                DataSet ds = null;
                ClsCN oCnLoc = new ClsCN();
                DAL.ClsUser oUser = new DAL.ClsUser();
@@ -321,7 +321,7 @@
                            return objjson;
                        }
                    }
                }                
                }
                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "展开成功！";
@@ -474,8 +474,8 @@
                //    return objJsonResult;
                //}

                string sql = "update Gy_Czygl set " + 
                    "HWhID = " + HWhID + 
                string sql = "update Gy_Czygl set " +
                    "HWhID = " + HWhID +
                    ", HWhName = '" + HWhName +
                    "', HSecManagerID = " + HSecManagerID +
                    ", HSecManager = '" + HSecManager +
@@ -1289,7 +1289,7 @@
        /// <returns></returns>
        [Route("Web/GetSouceList_Json")]
        [HttpGet]
        public object GetSouceList_Json(string HMaterID,string Value, Int64 HOrgID)
        public object GetSouceList_Json(string HMaterID, string Value, Int64 HOrgID)
        {
            sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";
            if (Value != "" && Value != null)
@@ -1298,7 +1298,7 @@
            }
            try
            {
                string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID+",'"+ sWhere + "'";
                string sql = "EXEC h_p_Gy_SouceViewList " + HMaterID + ",'" + sWhere + "'";
                ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceViewList");

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -1709,7 +1709,7 @@
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
                }              
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
@@ -1736,7 +1736,7 @@
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }         
            }
        }

        /// <summary>
@@ -2948,7 +2948,7 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
             


                oCN.RunProc("delete Gy_ErrType where HItemID=" + HItemID);
                oCN.Commit();//提交事务
@@ -5237,7 +5237,7 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
               


                oCN.RunProc("delete Gy_PostSkill where HItemID=" + HItemID);
                oCN.Commit();//提交事务
@@ -5584,7 +5584,7 @@
                WebAPI.DLL.ClsGy_StockMoveStyle_Ctl oBill = new WebAPI.DLL.ClsGy_StockMoveStyle_Ctl();
                List<Model.ClsGy_StockMoveStyle_Model> lsmain = new List<Model.ClsGy_StockMoveStyle_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  
                msg1 = msg1.Replace("\n", "");
                lsmain = oListModels.getObjectByJson_Gy_StockMoveStyle(msg1);
                foreach (Model.ClsGy_StockMoveStyle_Model oItem in lsmain)
                {
@@ -8101,7 +8101,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                

                WebAPI.DLL.ClsGy_ProjectMoney_Ctl oBill = new WebAPI.DLL.ClsGy_ProjectMoney_Ctl();
                List<Model.ClsGy_ProjectMoney_Model> lsmain = new List<Model.ClsGy_ProjectMoney_Model>();
                msg1 = msg1.Replace("\\", "");
@@ -8310,7 +8310,7 @@
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                

                ds = oCN.RunProcReturn("select * from Gy_ProjectMoney where HItemID=" + HItemID, "Gy_ProjectMoney");
                if (ds.Tables[0].Rows.Count > 0)
                {
@@ -8402,7 +8402,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                

                WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl oBill = new WebAPI.DLL.ClsGy_ErrMsgBackType_Ctl();
                List<Model.ClsGy_ErrMsgBackType_Model> lsmain = new List<Model.ClsGy_ErrMsgBackType_Model>();
                msg1 = msg1.Replace("\\", "");
@@ -9816,7 +9816,7 @@
                }
                oCN.BeginTran();//开始事务

               

                oCN.RunProc("delete Gy_PreventErrMould where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
@@ -10374,6 +10374,369 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  ä¼‘息日  è®¾ç½®åˆ—表/保存/编辑/删除方法
        /// <summary>
        ///  ä¼‘息日 ä¿å­˜
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("SaveGy_RestDayList")]
        [HttpPost]
        public object SaveGy_RestDayList([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();

            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //获取最大ID值赋值
            DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
            {
                //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                maxid += 1;
                HItemID = maxid;
            }
            ListModels oListModels = new ListModels();
            try
            {

                WebAPI.DLL.ClsGy_RestDay_Ctl oBill = new WebAPI.DLL.ClsGy_RestDay_Ctl();
                List<Model.ClsGy_RestDay_Model> lsmain = new List<Model.ClsGy_RestDay_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");
                lsmain = oListModels.getObjectByJson_Gy_RestDay(msg1);
                foreach (Model.ClsGy_RestDay_Model oItem in lsmain)
                {
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！代码不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HName.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！名称不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //得到短代码
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
                    if (sShortNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！短代码为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HMakeEmp = msg2; //创建人
                    DayOfWeek dayOfWeek = oItem.HRestDay.DayOfWeek;

                    // å®šä¹‰æ˜ŸæœŸå‡ çš„中文映射关系
                    Dictionary<DayOfWeek, string> chineseDayOfWeek = new Dictionary<DayOfWeek, string>
                    {
                        { DayOfWeek.Sunday, "星期日" },                      
                        { DayOfWeek.Saturday, "星期六" }
                    };

                    // èŽ·å–中文星期几名称
                    oItem.HWeekDay = chineseDayOfWeek[dayOfWeek];
                    oBill.oModel = oItem;
                }

                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.oModel.HItemID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddNew();
                }
                else
                {
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }
                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;
            }
        }

        /// <summary>
        ///  ä¼‘息日 ä¿å­˜
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("SaveSumGy_RestDayList")]
        [HttpPost]
        public object SaveSumGy_RestDayList([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();

            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }


            JObject msgObj = JObject.Parse(msg1);
            string HYear = msgObj["HYear"].ToString();
            string HNumber1 = msgObj["HDeptNumber"].ToString()+'-' + msgObj["HOrgNumber"].ToString();
            string HName1 = msgObj["HDeptName"].ToString()+'-'+msgObj["HOrgName"].ToString();
            string HOrgID = msgObj["HOrgID"].ToString();
            string HDeptID = msgObj["HDeptID"].ToString();   
            bool HStopflag = bool.Parse(msgObj["HStopflag"].ToString());
            string HRemark= msgObj["HRemark"].ToString();
            string HUSEORGID= msgObj["HUSEORGID"].ToString();
            string HHelpCode= msgObj["HHelpCode"].ToString();
            string HMakeEmp = msg2; //创建人
            bool Sunday = Convert.ToBoolean(msgObj["Sunday"]);
            bool Saturday = Convert.ToBoolean(msgObj["Saturday"]);
            List<Tuple<DateTime, string>> sundaysInYear = GetSundaysInYear(Convert.ToInt32(HYear),  Sunday,  Saturday);

            foreach (var oItem in sundaysInYear)
            {
                Int64 HItemID = 0;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //获取最大ID值赋值
                DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_RestDay ", "Gy_RestDay");
                if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
                {
                    //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
                    var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                    maxid += 1;
                    HItemID = maxid;
                }
                DateTime HRestDay = oItem.Item1;
                string HWeekDay = oItem.Item2; // èŽ·å–星期字符串
                string HDate = oItem.Item1.ToString("yyyyMMdd");
                string HNumber = "";
                string HName = "";
                HNumber = HNumber1 + '-' + HDate;
              
                 HName = HName1 + '-' + HDate;
                //先查看数据库有没有
                ds = oCN.RunProcReturn("select * from Gy_RestDay where HRestDay='" + HRestDay + "' and HOrgID='" + HOrgID + "' and HDeptID='" + HDeptID + "'", "Gy_RestDay");
                if (ds.Tables[0].Rows.Count<1)
                {
                    oCN.RunProc("Insert into Gy_RestDay " +
                   " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID," +
                   "HOrgID,HDeptID,HRestDay,HWeekDay) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "',''," + 0 +
                   "," + 0 + "," + 0 + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + DateTime.Now + "','" + HUSEORGID + "',' æœªæ£€æµ‹','" + HMakeEmp + "','" + HUSEORGID + "'" +
                   ",'" + HOrgID.ToString() + "','" + HDeptID.ToString() + "','" + HRestDay.ToString() + "','" + HWeekDay.ToString() + "')");
                }                
            }
            objJsonResult.code = "0";
            objJsonResult.count = 1;
            objJsonResult.Message = "保存成功！";
            objJsonResult.data = 1;
            return objJsonResult;
        }

        /// <summary>
        /// ä¼‘息日 èŽ·å–信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_RestDayDetailEdit")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
        {
            var model = LuBaoSevice.GetGy_RestDayDetailEdit(HID);
            return model;
        }

        /// <summary>
        /// ä¼‘息日 èŽ·å–信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_RestDayDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_RestDayDetail(string HName)
        {
            var model = LuBaoSevice.GetGy_RestDayDetail(HName);
            return model;
        }

        /// <summary>
        /// ä¼‘息日 åˆ é™¤åŠŸèƒ½
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_RestDay")]
        [HttpGet]
        public object DeltetGy_RestDay(string HItemID, string user)
        {
            DataSet ds;
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_RestDay_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HItemID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务


                oCN.RunProc("delete Gy_RestDay where HItemID=" + HItemID);
                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;
            }
        }

        //获取一年中的周六,周日或者两个同时获取
        public List<Tuple<DateTime, string>> GetSundaysInYear(int HYear, bool Sunday,bool Saturday)
        {
            List<Tuple<DateTime, string>> Days = new List<Tuple<DateTime, string>>();
            DateTime startDate = new DateTime(HYear, 1, 1);
            DateTime endDate = new DateTime(HYear, 12, 31);
            //星期天勾选
            if (Sunday && !Saturday)
            {
                while (startDate <= endDate)
                {
                    if (startDate.DayOfWeek == DayOfWeek.Sunday)
                    {
                        Days.Add(Tuple.Create(startDate, "星期天"));
                    }
                    startDate = startDate.AddDays(1);
                }
            }
            //星期六 å‹¾é€‰
            else if (!Sunday && Saturday)
            {
                while (startDate <= endDate)
                {
                    if (startDate.DayOfWeek == DayOfWeek.Saturday)
                    {
                        Days.Add(Tuple.Create(startDate, "星期六"));
                    }
                    startDate = startDate.AddDays(1);
                }
            }
            else if (Sunday && Saturday)
            {
                while (startDate <= endDate)
                {
                    if (startDate.DayOfWeek == DayOfWeek.Saturday || startDate.DayOfWeek == DayOfWeek.Sunday)
                    {
                        string weekdayChinese;
                        if (startDate.DayOfWeek == DayOfWeek.Sunday)
                        {
                            weekdayChinese = "星期天";
                            Days.Add(Tuple.Create(startDate, weekdayChinese));
                        }                       
                        else if (startDate.DayOfWeek == DayOfWeek.Saturday)
                        {
                            weekdayChinese = "星期六";
                            Days.Add(Tuple.Create(startDate, weekdayChinese));
                        }                       
                    }
                    startDate = startDate.AddDays(1);
                }
            }                     
            return Days;
        }

        //返回的字段
        public class DayOfWeekInfo
        {
            public DateTime Date { get; set; }
            public string DayOfWeekText { get; set; }
        }
        #endregion

@@ -11497,7 +11860,7 @@
        /// <returns></returns>
        [Route("Web/GetSc_ICMOBillListView3")]
        [HttpGet]
        public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID,int HSourceID)
        public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID, int HSourceID)
        {
            if (ICMOBill != "")
            {
@@ -11865,7 +12228,7 @@
        /// <returns></returns>
        [Route("Web/GetCheckItemByCheckProjectID")]
        [HttpGet]
        public object GetCheckItemByCheckProjectID(int CheckProjectID,int HBatchQty)
        public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
        {
            if (CheckProjectID <= 0)
            {
@@ -11984,17 +12347,17 @@
                DataSet ds2;
                DataSet ds1;

            //    string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
            //                                    from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
            //                                    left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
            //                                    left join Gy_Employee e on e.HItemID=t.HManagerID
            //                                    where a.HInterID=" + MouldMaintainRuleID);
                //    string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                //                                    from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                //                                    left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                //                                    left join Gy_Employee e on e.HItemID=t.HManagerID
                //                                    where a.HInterID=" + MouldMaintainRuleID);

            //    string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
                                                //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
            //                                    left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                                //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
            //                                    where a.HInterID=" + MouldMaintainRuleID);
                //    string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
                //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
                //                                    left join h_v_IF_Material m on b.HMaterID=m.HItemID
                //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                //                                    where a.HInterID=" + MouldMaintainRuleID);

                string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
                string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);
@@ -12134,16 +12497,16 @@
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
            //    string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
            //                                    from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
            //                                    left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
            //                                    left join Gy_Employee e on e.HItemID=t.HManagerID
            //                                    where a.HInterID=" + EquipProjectID);
            //    string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                                //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
            //                                    left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                                //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
            //                                    where a.HInterID=" + EquipProjectID);
                //    string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                //                                    from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                //                                    left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                //                                    left join Gy_Employee e on e.HItemID=t.HManagerID
                //                                    where a.HInterID=" + EquipProjectID);
                //    string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                //                                    left join h_v_IF_Material m on b.HMaterID=m.HItemID
                //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                //                                    where a.HInterID=" + EquipProjectID);

                string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
                string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);
@@ -12228,7 +12591,7 @@
        /// <returns></returns>
        [Route("Web/GetItemByEquipFile")]
        [HttpGet]
        public object GetItemByEquipFile(int EquipProjectID,string Type,string HDate)
        public object GetItemByEquipFile(int EquipProjectID, string Type, string HDate)
        {
            if (EquipProjectID <= 0)
            {
@@ -12311,7 +12674,7 @@
                {
                    case "DJ":
                        HView = "h_v_QJ_GetDotCheckItemList";
                        break;                  
                        break;
                    default:
                        objjson.code = "0";
                        objjson.count = 0;
@@ -12369,8 +12732,8 @@
            }
            try
            {
                
                string sql = string.Format(@"select * from  h_v_QJ_GetDotCheckItemList where ç‚¹æ£€è®¡åˆ’ID = " + HInterID );

                string sql = string.Format(@"select * from  h_v_QJ_GetDotCheckItemList where ç‚¹æ£€è®¡åˆ’ID = " + HInterID);
                ds = oCN.RunProcReturn(sql, "h_v_QJ_GetDotCheckItemList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
@@ -12405,8 +12768,8 @@
        /// <returns></returns>
        [Route("Web/GetEquipmentBillsList")]
        [HttpGet]
        public object GetEquipmentBillsList(string sWhere, string Type,string user)
        {            
        public object GetEquipmentBillsList(string sWhere, string Type, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
@@ -12807,26 +13170,26 @@
        /// <returns></returns>
        [Route("Web/GetHSourceBillType")]
        [HttpGet]
        public object GetHSourceBillType(string HName,int Num)
        public object GetHSourceBillType(string HName, int Num)
        {
            try
            {
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //有的单子源单分为红蓝单  0代表蓝单  1代表红单
                if (Num==0)
                if (Num == 0)
                {           //源单为蓝单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "'and  HRedBlueFlag ='"+ Num+"' ", "Xt_BillSourceSet");
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "'and  HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
                }
                else if (Num==1)
                else if (Num == 1)
                {          //源单为红单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "' and  HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
                }
                else if(Num==2)
                else if (Num == 2)
                {       //不分红蓝单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "'", "Xt_BillSourceSet");
                }
                

                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "获取成功！";
@@ -12901,7 +13264,7 @@
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();            //数据库操作工具
                string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
                ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet");        //查询当前用户的自定义菜单数据
                if (ds.Tables[0]==null || ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
                if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
                {
                    sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID  ";
                    ds = oCn.RunProcReturn(sql, "Gy_Menu");
@@ -13026,7 +13389,7 @@
                List<MenuInit> menuInitList = new List<MenuInit>();                     //用以获取Gy_Menu_1中的所有菜单信息，以及对应节点是否被选中需要加载显示

                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" +HType + "' Order by HItemID ", "Gy_Menu");     //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据
                ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HItemID ", "Gy_Menu");     //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据

                DataSet ds1 = new DataSet();
                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)                                   //将Gy_Menu_1中的菜单信息及选中情况保存到menuInitList列表中，
@@ -13123,16 +13486,16 @@

                //设置数据库操作的回滚点，若在提交前报错，则回滚到该点，期间操作取消
                oCN.BeginTran();
                

                //删除当前用户的自定义数据
                string sql = "delete from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HTypes + "'";
                oCN.RunProc(sql);

                //插入当前用户最新的自定义数据
                for(int i=0;i< saveDataList.Count; i++)
                for (int i = 0; i < saveDataList.Count; i++)
                {
                    sql = "select * from Gy_Menu_1 where HItemID = '" + saveDataList[i].HItemID + "'";
                    ds = oCn.RunProcReturn(sql,"Gy_Menu_1");
                    ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        string HPartentID = ds.Tables[0].Rows[0]["HPartentID"].ToString();
@@ -13142,7 +13505,7 @@
                        string HType = ds.Tables[0].Rows[0]["HType"].ToString();
                        string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();

                        if(HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
                        if (HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
                        {
                            string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
@@ -13153,12 +13516,12 @@
                            sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
                            oCN.RunProc(sql);
                        }
                        

                    }
                }
                //提交数据库操作
                oCN.Commit();
                

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
@@ -13591,15 +13954,15 @@
        /// <returns></returns>
        [Route("Web/GetOtherInBillMain_TempList_New")]
        [HttpGet]
        public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
        public object GetOtherInBillMain_TempList_New(string HBillType, string sHMaker, Int64 HOrgID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                List<object> columnNameList = new List<object>();
                

                DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
                

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -13645,12 +14008,12 @@
        /// <returns></returns>
        [Route("Web/GetProcNoList")]
        [HttpGet]
        public object GetProcNoList(int HInterID,string sWhere,string UserID)
        public object GetProcNoList(int HInterID, string sWhere, string UserID)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'", "h_p_Sc_ProcNoList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/DLL/ClsGy_RestDay_Ctl.cs

New file
@@ -0,0 +1,108 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace WebAPI.DLL
{
    public class ClsGy_RestDay_Ctl : DBUtility.ClsGy_Base_Ctl   
    {
        
           SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public Model.ClsGy_RestDay_Model oModel = new Model.ClsGy_RestDay_Model();
        //新增
        public override bool AddNew()
        {
            //
            try
            {
                oCn.BeginTran();
                oCn.RunProc("Insert into " + MvarItemKey + " " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID," +
                    "HOrgID,HDeptID,HRestDay,HWeekDay) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "'" +
                    ",'" + oModel.HOrgID.ToString() + "','" + oModel.HDeptID.ToString() + "','" + oModel.HRestDay.ToString() + "','" + oModel.HWeekDay.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }

        //修改
        public override bool ModifyByID(Int64 sItemID)
        {
            try
            {
                
                oCn.BeginTran();
                oCn.RunProc("Update " + MvarItemKey + " set " +
                    " HNumber='" + oModel.HNumber + "'" +
                    ",HName='" + oModel.HName + "'" +
                    ",HShortNumber='" + oModel.HShortNumber + "'" +
                    ",HHelpCode='" + oModel.HHelpCode + "'" +
                    ",HModifyTime='" + DateTime.Now + "'" +   
                    ",HUSEORGID='" + oModel.HUSEORGID + "'" +
                    ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
                    ",HOrgID ='" + oModel.HOrgID + "'" +
                    ",HDeptID ='" + oModel.HDeptID + "'" +
                    ",HRestDay ='" + oModel.HRestDay + "'" +
                    ",HWeekDay  ='" + oModel.HWeekDay + "'" +  
                    ",HUseFlag='" + oModel.HUseFlag + "'" +
                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }
        //根据代码判断信息
        public override bool HavParentCode(string sCode, Int64 sItemID)
        {
            DataSet DS;
            try
            {
                DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count == 0)
                    return false;
                else
                {
                    oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
                    return true;
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //构造函数
        public ClsGy_RestDay_Ctl()
        {
            MvarItemKey = "Gy_RestDay";
            MvarReportTitle = "防错装置设置";
            oModel = new Model.ClsGy_RestDay_Model();
        }

    

    }
}

 WebAPI/ListModels.cs

@@ -1122,7 +1122,7 @@
            List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
            return list;
        }

        
        /// <summary>  
        /// å¤„理新增防错装置表的json
        /// </summary>
@@ -1134,6 +1134,30 @@
            List<Model.ClsGy_PreventErrMould_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PreventErrMould_Model>>(jsonString);
            return list;
        }
        /// <summary>  
        /// å¤„理新增休息日表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_RestDay_Model> getObjectByJson_Gy_RestDay(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
            return list;
        }

        /// <summary>  
        /// å¤„理新增休息日表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_RestDay_Model> getObjectByJson_SumGy_RestDay(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
            return list;
        }


        /// <summary>  
        /// å¤„理新增保养级别表的json

 WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-07-12T03:12:48.2429052Z;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <History>True|2024-07-15T10:25:56.8513970Z;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/12/2024 11:12:04</publishTime>
      <publishTime>07/15/2024 18:25:44</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/12/2024 11:12:04</publishTime>
      <publishTime>07/15/2024 18:25:44</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/12/2024 11:12:03</publishTime>
      <publishTime>07/15/2024 18:25:43</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/12/2024 11:12:03</publishTime>
      <publishTime>07/15/2024 18:25:43</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/12/2024 11:12:01</publishTime>
      <publishTime>07/15/2024 18:25:41</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/12/2024 11:12:01</publishTime>
      <publishTime>07/15/2024 18:25:41</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/12/2024 11:11:59</publishTime>
      <publishTime>07/15/2024 18:25:39</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/12/2024 11:11:59</publishTime>
      <publishTime>07/15/2024 18:25:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/12/2024 11:12:00</publishTime>
      <publishTime>07/15/2024 18:25:40</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/12/2024 11:12:08</publishTime>
      <publishTime>07/15/2024 18:25:49</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/12/2024 11:12:08</publishTime>
      <publishTime>07/15/2024 18:25:49</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/12/2024 11:12:47</publishTime>
      <publishTime>07/15/2024 18:25:56</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Service/LuBaoSevice.cs

@@ -662,6 +662,44 @@
        }

        /// <summary>
        /// ä¼‘息日根据id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "名称不能为空" };
            var dataSet = GetGy_RestDayEditDb(HID);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在休息日数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        public static DataSet GetGy_RestDayEditDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select * from h_v_Gy_RestDay where HItemID= '" + HID + "' ", "h_v_Gy_RestDay");
            return dataSet;
        }

        /// <summary>
        /// ä¼‘息日根据登录人获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_RestDayDetail(string HName)
        {
            if (string.IsNullOrEmpty(HName))
                return new ApiResult<DataSet> { code = -1, msg = "名称不能为空" };
            var dataSet = GetGy_RestDayDb(HName);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在休息日数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        public static DataSet GetGy_RestDayDb(string HName)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select a.HDeptID,b.HNumber éƒ¨é—¨ç¼–码,b.HName éƒ¨é—¨åç§°,c.HNumber ç»„织编码,c.Hname ç»„织名称 from Gy_Czygl a left join Gy_Department b on a.HDeptID = b.HItemID left join Xt_ORGANIZATIONS c on a.HUSEORGID = c.HItemID where a.Czymc = '" + HName + "' ", "Gy_Czygl");
            return dataSet;
        }

        /// <summary>
        /// ä¿å…»çº§åˆ«æ ¹æ®id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_MaintainLevDetail(string HID)

 WebAPI/WebAPI.csproj

@@ -685,6 +685,7 @@
    <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
    <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
    <Compile Include="DLL\ClsGy_MaintainLev_Ctl.cs" />
    <Compile Include="DLL\ClsGy_RestDay_Ctl.cs" />
    <Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
    <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
    <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />