Wms/Wms/Controllers/StatisticalController.cs
@@ -17,13 +17,13 @@
        /// </summary>
        private readonly IStockServer _stock; //统计报表
        private readonly IStockDetailServer _stockDetail; //统计报表
        private readonly IDataBoxInfoServer _dataBoxInfo; //统计报表
        private readonly IDataBoxInfoServer _dataBoxInfo; //导出
        /// <summary>
        /// 构造函数
        /// </summary>
        /// <param name="stock">统计报表</param>
        /// <param name="stockDetail">库存箱码明细</param>
        /// <param name="dataBoxInfo">库存箱码明细</param>
        /// <param name="dataBoxInfo">导出</param>
        public StatisticalController(IStockServer stock, IStockDetailServer stockDetail, IDataBoxInfoServer dataBoxInfo)
        {
            _stock = stock; //统计报表
@@ -40,9 +40,9 @@
        /// <param name="skuName"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList(string skuNo, string skuName)
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName,string lotNo)
        {
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName);
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName,lotNo);
            return Ok(new
            {
                data = StockList,
@@ -64,9 +64,9 @@
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
        public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
        {
            List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus);
            List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName);
            return Ok(new
            {
                data = stockDetailsList,
@@ -94,11 +94,11 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName)
        {
            try
            {
                List<DataStockDetail> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)
@@ -261,6 +261,52 @@
        #endregion
        #region 年度报表
        /// <summary>
        /// 获取年报表
        /// </summary>
        /// <param name="StartTime"></param>
        /// <param name="EndTime"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetAssSoInfo(string StartTime, string EndTime)
        {
            try
            {
                var skulist = _stock.GetAssSoInfo(StartTime, EndTime);
                return Ok(new { code = 0, count = 0, data = skulist, msg = "获取总量成功" });
            }
            catch (Exception ex)
            {
                return Ok(new { code = 1, count = 0, msg = ex.Message });
            }
        }
        /// <summary>
        /// 获取年报表明细
        /// </summary>
        /// <param name="skuNo"></param>
        /// <param name="StartTime"></param>
        /// <param name="EndTime"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetAssSoInfoDetail(string skuNo, string StartTime, string EndTime)
        {
            try
            {
                var infolist = _stock.GetAssSoInfoDetail(skuNo, StartTime, EndTime);
                return Ok(new { code = 0, count = 0, data = infolist, msg = "获取明细成功" });
            }
            catch (Exception ex)
            {
                return Ok(new { code = 1, count = 0, msg = ex.Message });
            }
        }
        #endregion
        #region 导出
        /// <summary>
        /// 导出库存总量