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

yangle

2025-04-15 9382e8326714a25e04661150d0f11ad47ca0fcac

 WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,51 +32,58 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();  //定义声明变量 ，把通过 new List<object>()创建的 实例，赋值给变量
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1, "h_v_IF_EntrustOrderBillList");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql1+ sWhere, "h_v_IF_EntrustOrderBillList");
                }

                ////判断是否有采购经理权限
                //bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
                //if (!isCgjl)
                //if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
                //{
                //    sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查询权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
                //ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");

                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                //string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
                //if (sWhere == null || sWhere.Equals(""))
                //{
                //    ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                //}
                //else
                //{
                //    ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                //}

                //判断是否有采购经理权限（安瑞）
                bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
                if (!isCgjl)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无记录";
                    objJsonResult.data = null;
                    return objJsonResult;
                    sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
                }
                else
                string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
                ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
                foreach (DataColumn col in ds.Tables[0].Columns)//遍历ds中第一个表（Tables[0]）的所有列（Columns）每次循环中，col变量会持有当前列的引用
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    Type dataType = col.DataType; //获取当前数据类型传入 自定义变量datadataType
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //字符串拼接         // 将列名和数据类型信息拼接成一个JSON格式的字符串
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //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)
            {