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

yangle

2023-08-16 55c64d855c964da4a8fbede789abb198107cadca

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

@@ -783,32 +783,26 @@
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_AssemblyBillList " + sWhere, "h_v_Sc_AssemblyBillList");
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList");
                }
                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;
                }

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