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

zrg

2024-03-29 d77020014b91dd5096102b548140f71d668d5779

 WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs

@@ -149,14 +149,7 @@
            {
                List<object> columnNameList = new List<object>();

                if (HDeptID == "0" || HDeptID.Equals("")|| HWorkCenterID == "0" || HWorkCenterID.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipmentLoadReportListt '0','0'", "h_p_Sb_EquipmentLoadReportListt");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipmentLoadReportListt '" + HDeptID + "','" + HWorkCenterID + "'", "h_p_Sb_EquipmentLoadReportListt");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)