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

admin

7 天以前 1344f72375802566725e3719eeda1e2ddf8a4fe5

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

 Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs

@@ -17,10 +17,10 @@

namespace WMS.BLL.DataServer
{
    public class DataBoxInfoServer: DbHelper<DataBoxInfo>,IDataBoxInfoServer
    public class DataBoxInfoServer : DbHelper<DataBoxInfo>, IDataBoxInfoServer
    {
        private static readonly SqlSugarScope Db = DataContext.Db;
        public DataBoxInfoServer():base(Db)
        public DataBoxInfoServer() : base(Db)
        {
        }

@@ -40,7 +40,7 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, 
        public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
        {
            string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
@@ -186,10 +186,9 @@
        /// <param name="status">状态</param>
        /// <param name="inspectMark">检验标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <param name="isBale">是否裹包</param>
        /// <param name="isBelt">是否打带</param>
        /// <param name="locatNo">储位地址</param>
        /// <returns></returns>
        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
        public List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo)
        {
            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
@@ -235,6 +234,11 @@
            {
                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
@@ -246,6 +250,8 @@
                status, //状态
                inspectmark = inspectMark, //检验标记
                inspectstatus = inspectStatus, //质量状态
                //储位地址
                locatNo = locatNo,
            });
            return stockList;
        }

 Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs

@@ -49,8 +49,9 @@
        /// <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);
        List<AdventBoxInfoDto> GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo);

        #endregion


 Wms/Wms/Controllers/StatisticalController.cs

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