Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-09-12 7b778c7647e1c14288f7919290b7c403989c541c

 WebAPI/Controllers/BLL/Xt_SystemParameterController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,32 +30,43 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere, "h_v_Xt_SystemParameterList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere+ "  order by hitemid desc", "h_v_Xt_SystemParameterList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_SystemParameterList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hitemid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_Proh_v_Xt_SystemParameterListpertyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -67,6 +79,66 @@
        }


        /// <summary>
        /// 修改单据-保存按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_SystemParameter/AddBill1")]
        [HttpPost]
        public object AddBill1([FromBody] JObject oMain)
        {

            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<SystemParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SystemParameter>>(msg2);

                long HItemID = int.Parse(msg3);
                string HModClass = list[0].HModClass;
                string Hkey = list[0].HKey;
                string HCaption = list[0].HCaption;
                string HValue = list[0].Hvalue;
                string HReadonly = list[0].HReadonly;
                string HExplanation = list[0].HExplanation;
                string HFarmat = list[0].HFarmat;



                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Update Xt_BillType set " +
                    ",HValue= '" + HValue + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
                //
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改单据成功！";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        //
    }