优化bug与添加一键删除按钮

Zhang-Hong-Lin

2025-06-26 232cdf071bfe3bd2b77ba05accba89b67fcc1edc

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs

@@ -20,19 +20,62 @@
        public IRepository<Dt_LocationInfo> Repository => BaseDal;
        private readonly IRepository<dt_storagemode> _dt_storagemode;
        private readonly IMapper _mapper;
        private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
        private readonly IRepository<dt_batchInfo> _batchInfoRepository;
        //private readonly Idt_ErrormsginfoService _ErrormsginfoService;

        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal, IRepository<dt_storagemode> storagemode, IMapper mapper) : base(BaseDal)
        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal, IRepository<dt_storagemode> storagemode, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<dt_batchInfo> batchInfoRepository, IMapper mapper) : base(BaseDal)
        {
            _dt_storagemode = storagemode;
            _mapper = mapper;
            _stockInfoRepository = stockInfoRepository;
            _batchInfoRepository = batchInfoRepository;
        }

        public override PageGridData<Dt_LocationInfo> GetPageData(PageDataOptions options)
        {
            return base.GetPageData(options);
        }

        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            int id = saveModel.MainData["id"].ObjToInt();
            int locationStatus = saveModel.MainData["locationStatus"].ObjToInt();
            int enableStatus = saveModel.MainData["enableStatus"].ObjToInt();
            Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.Id == id);
            locationInfo.LocationStatus = locationStatus;
            locationInfo.EnableStatus = enableStatus;
            //有货生成库存信息
            if (locationStatus == 2)
            {
                //判断是否存在库存信息
                var w = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode);
                if(w == null)
                {
                        Dt_StockInfo stockInfo = new Dt_StockInfo();
                        //查询当前需要出库的批次号，以及出库物料类型
                        var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
                        stockInfo.BatchNo = batch.OutBatch;
                        stockInfo.Weight = 4;
                        stockInfo.LocationCode = locationInfo.LocationCode;
                        stockInfo.WarehouseId = 0;
                        stockInfo.StockStatus = 0;
                        stockInfo.Remark = 1;
                        _stockInfoRepository.AddData(stockInfo);
                }
            }
            //无货删除库存信息
            else if(locationStatus == 0)
            {
                //判断是否存在库存信息
                var w = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode);
                if (w != null)
                {
                    _stockInfoRepository.DeleteData(w);
                }
            }
            return UpdateData(locationInfo);
            //return base.UpdateData(saveModel);
        }
        public WebResponseContent GetLocationLayer()
        {
            WebResponseContent content = new WebResponseContent();
@@ -56,7 +99,7 @@
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent getlocation() 
        public WebResponseContent getlocation()
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -64,13 +107,13 @@
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                for (int i = 1; i < 38; i++)
                {
                    for (int a = 1; a < 7; a++)
                    for (int a = 1; a < 12; a++)
                    {
                        for (int g = 1; g < 3; g++)
                        {
                            Dt_LocationInfo location = new Dt_LocationInfo();
                            location.LocationCode = i+"-"+a+"-"+g;
                            location.LocationName = i+ "行" + a + "列" + "工位" + g;
                            location.LocationCode = i + "-" + a + "-" + g;
                            location.LocationName = i + "行" + a + "列" + "工位" + g;
                            location.RoadwayNo = "TC1";
                            location.Row = i;
                            location.Column = a;
@@ -78,7 +121,7 @@
                            location.Depth = g;
                            location.LocationType = (int)LocationTypeEnum.Flat;
                            location.LocationStatus = (int)LocationStatusEnum.Free;
                            location.EnableStatus=(int)EnableStatusEnum.Normal;
                            location.EnableStatus = (int)EnableStatusEnum.Normal;
                            location.CreateDate = DateTime.Now;
                            location.ModifyDate = DateTime.Now;
                            location.Creater = "WCS";
@@ -106,9 +149,18 @@
            try
            {
                var mode = _dt_storagemode.QueryFirst(v=>v.Id==1);
                if (mode.storagemode==(int)StorageModeEnum.Out)
                if (InMode == 6)
                {
                    var locations = BaseDal.QueryData(v=>v.EnableStatus== (int)EnableStatusEnum.Normal && v.LocationStatus==(int)LocationStatusEnum.Free).OrderBy(v=>v.Row).ToList();
                    var locations = BaseDal.QueryData(v => v.EnableStatus == (int)EnableStatusEnum.Normal && v.LocationStatus == (int)LocationStatusEnum.Free && v.LocationType==(int)LocationTypeEnum.Cube).OrderBy(v => v.Row).ToList();
                    if (locations.Count <= 0)
                    {
                        throw new Exception($"入库优先货位分配失败，当前无空闲货位");
                    }
                    location = locations[0];
                }
                else if (mode.storagemode==(int)StorageModeEnum.Out)
                {
                    var locations = BaseDal.QueryData(v=>v.EnableStatus== (int)EnableStatusEnum.Normal && v.LocationStatus==(int)LocationStatusEnum.Free && v.LocationType == (int)LocationTypeEnum.Flat).OrderBy(v=>v.Row).ToList();
                    if (locations.Count<=0) 
                    {
                        throw new Exception($"出库优先货位分配失败，当前无空闲货位");
@@ -117,7 +169,7 @@
                }
                else if(mode.storagemode == (int)StorageModeEnum.In)
                {
                    var locations = BaseDal.QueryData(v => v.EnableStatus == (int)EnableStatusEnum.Normal && v.LocationStatus == (int)LocationStatusEnum.Free).OrderByDescending(v => v.Row).ToList();
                    var locations = BaseDal.QueryData(v => v.EnableStatus == (int)EnableStatusEnum.Normal && v.LocationStatus == (int)LocationStatusEnum.Free && v.LocationType == (int)LocationTypeEnum.Flat).OrderByDescending(v => v.Row).ToList();
                    if (locations.Count <= 0)
                    {
                        throw new Exception($"入库优先货位分配失败，当前无空闲货位");
@@ -126,21 +178,31 @@
                }
                if (location!=null)
                {
                    //查找相邻的库位
                    Dt_LocationInfo Towlocation = new Dt_LocationInfo();
                    var Onelocation = BaseDal.QueryFirst(v => v.LocationCode == location.LocationCode);
                    if (Onelocation.Depth == 1)
                    if (InMode == 6)
                    {
                        Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
                        location.LocationStatus = (int)LocationStatusEnum.Lock;
                        BaseDal.UpdateData(location);
                    }
                    else
                    {
                        Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
                        //查找相邻的库位
                        Dt_LocationInfo Towlocation = new Dt_LocationInfo();

                        var Onelocation = BaseDal.QueryFirst(v => v.LocationCode == location.LocationCode);

                        if (Onelocation.Depth == 1)
                        {
                            Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
                        }
                        else
                        {
                            Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
                        }
                        location.LocationStatus = (int)LocationStatusEnum.Lock;
                        Towlocation.LocationStatus = (int)LocationStatusEnum.Lock;
                        BaseDal.UpdateData(location);
                        BaseDal.UpdateData(Towlocation);
                    }
                    location.LocationStatus = (int)LocationStatusEnum.Lock;
                    Towlocation.LocationStatus = (int)LocationStatusEnum.Lock;
                    BaseDal.UpdateData(location);
                    BaseDal.UpdateData(Towlocation);
                }
            }
            catch (Exception ex)
@@ -212,12 +274,12 @@
                                Row = i + 1,
                            };

    

                            locationInfo.Depth = 1;
                            locationInfo.LocationCode = $"{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}";
                            locationInfo.LocationName = $"{locationInfo.Row.ToString().PadLeft(3, '0')}行{locationInfo.Column.ToString().PadLeft(3, '0')}列{locationInfo.Layer.ToString().PadLeft(3, '0')}层";
                            
                           



                            locationInfos.Add(locationInfo);
                        }