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

yangle

2025-04-15 9382e8326714a25e04661150d0f11ad47ca0fcac

 WebAPI/Controllers/NewApiController.cs

@@ -17,9 +17,9 @@
        /// <returns></returns>
        [Route("api/newBill/getNewInterBillNo")]
        [HttpGet]
        public ApiResult<DocumentsView> GetNewInterBillNo()
        public ApiResult<DocumentsView> GetNewInterBillNo(string billType)
        {
            var model = YqnQbService.GetInterBillNo();
            var model = YqnQbService.GetInterBillNo(billType);
            return model;
        }
        /// <summary>
@@ -67,6 +67,17 @@
            return YqnQbService.GetWorkCenterList(sWhere);
        }
        /// <summary>
        /// 进站接收单
        /// </summary>
        /// <param name="oMain"></param>
        /// <returns></returns>
        [Route("api/newBill/setStationInBill")]
        [HttpPost]
        public ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
        {
            return YqnQbService.SetStationInBill(oMain);
        }
        /// <summary>
        /// 获取进站单列表
        /// </summary>
        /// <param name="sWhere"></param>
@@ -89,18 +100,6 @@
            return YqnQbService.GetStationOutBillList(sWhere);
        }
        /// <summary>
        /// 进站接收单
        /// </summary>
        /// <param name="oMain"></param>
        /// <returns></returns>
        [Route("api/newBill/setStationInBill")]
        [HttpPost]
        public ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
        {
            return YqnQbService.SetStationInBill(oMain);
        }
       
        /// <summary>
        /// 出站站接收单
        /// </summary>
        /// <param name="oMain"></param>
@@ -109,8 +108,131 @@
        [HttpPost]
        public ApiResult SetStationOutBill(StationOutBillView oMain)
        {
            
            return YqnQbService.SetStationOutBill(oMain);
        }
        /// <summary>
        /// 获取流转卡列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getStationMainList")]
        [HttpGet]
        public static ApiResult<DataSet> GetPorcessMainList(string sWhere)
        {
            return YqnQbService.GetPorcessMainList(sWhere);
        }
        /// <summary>
        /// 获取流转卡子表列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getPorcessSubList")]
        [HttpGet]
        public static ApiResult<DataSet> GetPorcessSubList(int hInterId)
        {
            return YqnQbService.GetPorcessSubList(hInterId);
        }
        /// <summary>
        /// 获取工序列表
        /// </summary>
        /// <param name="hName"></param>
        /// <param name="hLevel"></param>
        /// <param name="hNumber"></param>
        /// <param name="hBillSubType"></param>
        /// <returns></returns>
        [Route("api/newBill/getProcessList")]
        [HttpGet]
        public ApiResult<List<Models.M_Process>> GetProcessList(string hName,string hNumber, string hBillSubType,int page,int limit,int hLevel=0)
        {
            return YqnQbService.GetProcessList(hName, hLevel, hNumber, hBillSubType , page,  limit);
        }
        /// <summary>
        /// 获取单个工序详情
        /// </summary>
        /// <param name="hItemId"></param>
        /// <returns></returns>
        [Route("api/newBill/getProcessDetail")]
        [HttpGet]
        public ApiResult<Models.M_Process> GetProcessDetail(int hItemId)
        {
            return YqnQbService.GetProcessDetail(hItemId);
        }
        /// <summary>
        /// 删除某个工序
        /// </summary>
        /// <param name="hItemId"></param>
        /// <returns></returns>
        [Route("api/newBill/deleteProcess")]
        [HttpGet]
        public ApiResult DeleteProcess(int hItemId)
        {
            return YqnQbService.DeleteProcess(hItemId);
        }
        /// <summary>
        /// 获取不良仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getBadWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetBadWHList(string sWhere)
        {
            return YqnQbService.GetBadWHList(sWhere);
        }
        /// <summary>
        /// 获取报废仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWasterWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWasterWHList(string sWhere)
        {
            return YqnQbService.GetWasterWHList(sWhere);
        }
        /// <summary>
        /// 获取研发不良品仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getBadCountDevelopWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
        {
            return YqnQbService.GetBadCountDevelopWHList(sWhere);
        }
        /// <summary>
        /// 获取委外不良仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWWBadWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWWBadWHList(string sWhere)
        {
            return YqnQbService.GetWWBadWHList(sWhere);
        }
        /// <summary>
        /// 获取委外报废仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWWWasterWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWWWasterWHList(string sWhere)
        {
            return YqnQbService.GetWWWasterWHList(sWhere);
        }
        /// <summary>
        /// 获取良品仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWHList(string sWhere)
        {
            return YqnQbService.GetWHList(sWhere);
        }
    }
}