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

ch

2022-05-07 64eee12be4c7d513ac170bf13889b3de50be7f2b

 WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs

@@ -31,19 +31,28 @@
        {
            try
            {
                //判断是否有查询权限
                //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("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList");
                //    ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                //}
                //else
                //{
                //    string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
                //    string sql = sql1 + sWhere;
                //    ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
                //    ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                //}

                //判断是否有采购经理权限
                bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, true, user);
                //判断是否有采购经理权限（安瑞）
                bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
                if (!isCgjl)
                {
                    sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
@@ -51,11 +60,22 @@
                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)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {