Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 Wms/Wms/Controllers/StatisticalController.cs

@@ -16,19 +16,22 @@
        /// 依赖注入
        /// </summary>
        private readonly IStockServer _stock; //统计报表
        private readonly IStockDetailServer _stockDetail; //统计报表
        private readonly IStockDetailServer _stockDetail; //库存箱码明细
        private readonly IDataBoxInfoServer _dataBoxInfo; //导出
        private readonly IStockInfoServer _stockInfo; //库存信息
        /// <summary>
        /// 构造函数
        /// </summary>
        /// <param name="stock">统计报表</param>
        /// <param name="stockDetail">库存箱码明细</param>
        /// <param name="dataBoxInfo">导出</param>
        public StatisticalController(IStockServer stock, IStockDetailServer stockDetail, IDataBoxInfoServer dataBoxInfo)
        /// <param name="stockInfo">库存信息</param>
        public StatisticalController(IStockServer stock, IStockDetailServer stockDetail, IDataBoxInfoServer dataBoxInfo, IStockInfoServer stockInfo)
        {
            _stock = stock; //统计报表
            _stockDetail = stockDetail;
            _dataBoxInfo = dataBoxInfo;
            _stockDetail = stockDetail; //库存箱码明细
            _dataBoxInfo = dataBoxInfo; //导出
            _stockInfo = stockInfo; //库存信息
        }

        #region 库存明细
@@ -406,5 +409,29 @@

        }
        #endregion

        #region 库存信息

        /// <summary>
        /// 根据时间获取显示库存信息
        /// </summary>
        /// <param name="StartTime"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetDataStockInfo(string StartTime)
        {
            try
            {
                var list = _stockInfo.GetDataStockInfo(StartTime);
                return Ok(new { code = 0, count = list.Count, data = list, msg = "获取库存信息成功" });
            }
            catch (Exception ex)
            {

                return Ok(new { code = 1, count = 0, msg = ex.Message });
            }
        }

        #endregion
    }
}