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

wtt

2024-12-05 b541b4b3aed0ae5efcf9bf60eb8deb07b2ee944e

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs

@@ -4094,5 +4094,45 @@
            return response;
        }
        #endregion



        //#region è‡ªåŠ¨åŠ è½½é¡µé¢è¡¨å¤´
        ///// <summary>
        ///// è¿”回项目阶段列表
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Xt_DefineBillMainSet/getDefineBillMainSet")]
        //[HttpGet]
        //public object getDefineBillMainSet(string HModName, string user)
        //{
        //    try
        //    {
        //        string sql = "select * from h_v_Xt_DefineBillMainSet_AutoLoadList where HModName ='" + HModName + "' and HUser ='" + user + "' order by HArrangeOrder,HArrangeOrderSub";
        //        ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet");

        //        if(ds!=null && ds.Tables[0].Rows.Count == 0)
        //        {
        //            sql = "select * from h_v_Xt_DefineBillMainSet_AutoLoadList where HModName ='" + HModName + "' and HUser ='admin' order by HArrangeOrder,HArrangeOrderSub";
        //            ds = oCN.RunProcReturn(sql, "h_v_Xt_DefineBillMainSet_AutoLoadList");
        //        }

        //        objJsonResult.code = "1";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = "Sucess！";
        //        objJsonResult.data = ds.Tables[0];
        //        return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        //#endregion
    }
}