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

chenhaozhe

2026-04-16 59708a79ef698d66de3cd4da04346afd373d1c5e

 WebAPI/Controllers/Éú²ú¹ÜÀí/É豸״̬·Ö²½/Sc_HEquipStateDistributionController.cs

@@ -373,5 +373,34 @@
            }
        }
        #endregion

        #region è®¾å¤‡é©¾é©¶èˆ± æ ¹æ®éƒ¨é—¨æŸ¥è¯¢å¯¹åº”的设备

        [Route("Sc_HEquipStateDistribution/Get_HEquipStateList")]
        [HttpGet]
        public object Get_HEquipStateList(string HDeptID, string user, int OrganizationID)
        {
            try
            {
                string sql1 = string.Format("exec h_p_sc_HDeptEquipList {0},{1}", HDeptID, OrganizationID);

                ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptEquipList");

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