还原代码

admin

2 天以前 b58b6f92ab3f7caee1199d15d118e496122e5849

 Wms/Wms/Controllers/StatisticalController.cs

@@ -7,6 +7,10 @@
using WMS.IBLL.IDataServer;
using System.Security.Claims;
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
using WMS.BLL.LogServer;
using Model.ModelVm.BllTaskVm;
using Model.ModelVm;

namespace Wms.Controllers
{
@@ -21,6 +25,8 @@
        private readonly IStockDetailServer _stockDetail; //统计报表
        private readonly IDataBoxInfoServer _dataBoxInfo; //导出
        private readonly IStockInfoServer _stockInfo; //库存信息


        /// <summary>
        /// 构造函数
        /// </summary>
@@ -35,6 +41,76 @@
            _dataBoxInfo = dataBoxInfo;
            _stockInfo = stockInfo; //库存信息
        }


        /// <summary>
        /// 获取库存物料类型分布
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetGoodsTypeFb()
        {
            IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetGoodsTypeFb();
            return Ok(new
            {
                data = dtoIE,
                code = 0,
                msg = "获取仓库详情成功"
            });
        }


        /// <summary>
        /// 获取库存质量状态分布
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetQualityStatusFb()
        {
            IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetQualityStatusFb();
            return Ok(new
            {
                data = dtoIE,
                code = 0,
                msg = "获取仓库详情成功"
            });
        }


        /// <summary>
        /// 获取仓库状况总
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetWareHouseState()
        {
            WarehouseStateDto dto = _stock.GetWareHouseState();
            return Ok(new
            {
                data = dto,
                code = 0,
                msg = "获取仓库概况成功"
            });
        }


        /// <summary>
        /// 获取仓库状况详情
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetWareHouseStateInfo()
        {
            IEnumerable<WarehouseUseDto> dtoIE = _stock.GetWareHouseStateInfo();
            return Ok(new
            {
                data = dtoIE,
                code = 0,
                msg = "获取仓库详情成功"
            });
        }



        #region 库存明细

@@ -51,9 +127,9 @@
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        [HttpGet]
        public async Task<IActionResult> GetInventoryList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus)
        public async Task<IActionResult> GetInventoryList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
        {
            List<MateDataStockDto> StockList = await _stock.GetDataStockList(selectType, skuNo, skuName, ownerNo, ownerName, lotNo, status, inspectStatus);
            List<MateDataStockDto> StockList = await _stock.GetDataStockList(selectType, skuNo, skuName, ownerNo, ownerName, lotNo, status, inspectStatus, wareHouseNo, areaNo);
            return Ok(new
            {
                data = StockList,
@@ -90,6 +166,7 @@

        #region 托盘明细


        /// <summary>
        /// 获取托盘明细
        /// </summary>
@@ -103,16 +180,19 @@
        /// <param name="bitPalletMark">零托标记</param>
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <param name="ownerNo">货主编码</param>
        /// <param name="ownerName">货主名称</param>
        /// <param name="startTime">开始时间</param>
        /// <param name="endTIme">结束时间</param>
        /// <param name="WareHouseNo">所属仓库</param>
        /// <param name="AreaNo">所属区域</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, string ownerNo, string ownerName, 
            string startTime, string endTIme,string WareHouseNo,string AreaNo)
        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, string startTime, string endTIme, string WareHouseNo, string AreaNo)
        {
            try
            {
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, 
                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)
@@ -120,6 +200,40 @@
                return Ok(new { data = "", code = 0, msg = e.Message });
            }

        }
        /// <summary>
        /// 托盘明细备注
        /// </summary>
        /// <param name="id"></param>
        /// <param name="demo"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        [HttpGet]
        public IActionResult EditStockDetailDemo(int id, string demo)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                string userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    throw new Exception("未获取到用户信息");
                }

                _stockDetail.EditStockDetailDemo(id, demo, int.Parse(userId));


                return Ok(new { code = 0, msg = "编辑备注成功" });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
@@ -137,7 +251,7 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, 
        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
        {
            try
@@ -447,5 +561,26 @@
        }

        #endregion

        #region#补打标签
        /// <summary>
        /// 补打库存明细箱码
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetBuDaLabelList(BuDaLabelBoxVm model)
        {
            try
            {
                var list = _dataBoxInfo.GetBuDaLabelList(model.BoxNo);
                return Ok(new { code = 0, msg = "获取补打箱码标签信息", data = list });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, count = 0, msg = e.Message });
            }
        }
        #endregion
    }
}