还原获取临期预警信息GetEmergencyWarning增加储位地址筛选代码

admin

4 天以前 a3885030a6d5ab0c07eafee1861e5c4fbdedb600

还原获取临期预警信息GetEmergencyWarning增加储位地址筛选代码

 Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs

@@ -187,8 +187,10 @@
        /// <param name="inspectMark">检验标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <param name="locatNo">储位地址</param>
        /// <param name="sortField">排序字段</param>
        /// <param name="sortType">排序方式</param>
        /// <returns></returns>
        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo)
        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
        {
            string str = @" select d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,
                             a.SkuNo,a.SkuName,SUM(a.Qty) as Qty,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime
@@ -234,11 +236,6 @@
            {
                str += " and a.InspectStatus = @inspectstatus";
            }
            //判断质量状态是否为空
            if (!string.IsNullOrEmpty(locatNo))
            {
                str += " and c.LocatNo=@locatNo";
            }
            //排序
            str += @" group by d.WareHouseName,d.WareHouseNo,e.RoadwayName,e.RoadwayNo,f.AreaName,f.AreaNo,c.LocatNo,a.PalletNo,a.SkuNo,a.SkuName,a.Standard,a.LotNo,a.SupplierLot,a.ProductionTime,a.Status,c.ExpirationTime order by a.SkuNo,a.LotNo ";
            List<AdventBoxInfoDto> stockList = Db.Ado.SqlQuery<AdventBoxInfoDto>(str, new
@@ -250,8 +247,6 @@
                status, //状态
                inspectmark = inspectMark, //检验标记
                inspectstatus = inspectStatus, //质量状态
                //储位地址
                locatNo = locatNo,
            });
            return stockList;
        }

 Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs

@@ -49,9 +49,8 @@
        /// <param name="status">状态</param>
        /// <param name="inspectMark">检验标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <param name="locatNo">储位地址</param>
        /// <returns></returns>
        List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo);
        List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus);

        #endregion


 Wms/Wms/Controllers/StatisticalController.cs

@@ -325,16 +325,13 @@
        /// <param name="status">状态</param>
        /// <param name="inspectMark">检验标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <param name="locatNo">储位地址</param>
        /// <param name="sortField">排序字段</param>
        /// <param name="sortType">排序方式</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo, string sortField, string sortType)
        public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
        {
            try
            {
                List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus, locatNo, sortField, sortType);
                List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus);
                return Ok(new { data = stockList, code = 0, msg = "获取临期预警成功" });
            }
            catch (Exception e)