1、器具档案新增编辑页面增加货主类型、预警寿命 2、新增器具保养规程单

zzr99

2021-11-11 2bc24245838af613a6101a1e835bedf29ad8b8cf

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -25,37 +25,25 @@
        /// </summary>
        [Route("Xt_ORGANIZATIONS/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere, string Organization)
        {
            try

            {
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_ORGANIZATIONSList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }
                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;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -86,12 +74,12 @@
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
              

                long HParentID = list[0].HParentID;
               

                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
              

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
@@ -103,12 +91,12 @@
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                string sql = "Insert into  Xt_ORGANIZATIONS " +
                  " (HNumber,HName,HParentID" +
                   ",HStopflag" +
                string sql = "Insert into Xt_ORGANIZATIONS " +
                    " (HNumber,HName,HParentID" +
                   ",HStopflag,HMakeTime" +
                   ",HRemark) " +
                   " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
                   "," + HStopflag +
                   "," + HStopflag + "getdate()" +
                   ",'" + HRemark + "')";
                oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
@@ -161,7 +149,7 @@
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;

                DateTime HMakeTime = list[0].HMakeTime;
                long HParentID = list[0].HParentID;

                string HRemark = list[0].HRemark;
@@ -201,14 +189,14 @@
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
                    " (HNumber,HName,HParentID" +
                   ",HStopflag" +
                   ",HStopflag,HMakeTime" +
                   ",HRemark) " +
                   " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
                   "," + HStopflag +
                   "," + HStopflag + "getdate()" +
                   ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);

                    //修改上级为非末级代码
                    oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
@@ -219,6 +207,7 @@
                               " HNumber='" + HNumber + "'" +
                                 ",HName='" + HName + "'" +
                                  ",HParentID=" + HParentID +
                                  ",HMakeTime=" + HMakeTime +
                                 ",HStopflag='" + HStopflag + "'" +
                                 ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -246,7 +235,7 @@
        /// </summary>
        /// <returns></returns>
        [Route("DeltetXt_ORGANIZATIONSList")]
        

        [HttpGet]
        public object DeltetXt_ORGANIZATIONSList(string HItemID)
        {