修改问题

IPC-610

2025-01-02 4acb88b7afaab5b18a1c9ca8a78ce346297c382f

 Wms/Wms/Controllers/StatisticalController.cs

@@ -16,19 +16,22 @@
        /// 依赖注入
        /// </summary>
        private readonly IStockServer _stock; //统计报表
        private readonly IStockDetailServer _stockDetail; //统计报表
        private readonly IDataBoxInfoServer _dataBoxInfo; //统计报表
        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="dataBoxInfo">导出</param>
        /// <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 库存明细
@@ -40,9 +43,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,
@@ -62,11 +65,16 @@
        /// <param name="palletNo">托盘条码</param>
        /// <param name="status">库存状态</param>
        /// <param name="inspectStatus">质检状态</param>
        /// <param name="HouseNo">所属仓库</param>
        /// <param name="RoadwayNo">所属区域</param>
        /// <param name="Type">物料类型</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,string HouseNo,string AreaNo, string CategoryNo, string Type)
        {
            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, HouseNo, AreaNo, CategoryNo, Type);
            return Ok(new
            {
                data = stockDetailsList,
@@ -94,11 +102,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<StockDetailDto> 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 +269,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>
        /// 导出库存总量
@@ -360,5 +414,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
    }
}