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

chenhaozhe

2026-04-20 3378439708add2bc40f4d6d77aebc11367e380fd

 WebAPI/Controllers/NewApiController.cs

@@ -31,6 +31,17 @@
        public ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
        {
            var model = YqnQbService.GetHbarCodeDetail(sBillBarCode);
            // 通过model 中的data来判断 工单号 是否属于开工状态，如果属于开工状态，则报错
            // string HProcExchBillStatus = model.data.Tables[0].Rows[0]["单据状态"]?.ToString();
            // if(HProcExchBillStatus != null && HProcExchBillStatus != "3")
            // {
            //     // 只有开工状态允许生成取样单
            //     model.data = null;
            //     model.code = 0;
            //     model.count = 0;
            //     model.msg = $"工单：{model.data.Tables[0].Rows[0]["单据号"].ToString()} 不为开工状态! 不允许生成取样单!";
            //     return model;
            // }
            return model;
        }
        /// <summary>
@@ -168,5 +179,71 @@
        {
            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);
        }
    }
}