Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

2025-12-05 48710581fbbdd40eb3a743d91fa04e81531ba2ab

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs

@@ -89,22 +89,42 @@
            var lists = _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().ToList();
            foreach (var item in models)
            {
                var dbfirst = lists.FirstOrDefault(x => x.Code == item.Code);
                if (dbfirst != null)
                if (item.IsDelete == 1)
                {
                    dbfirst.Code = item.Code;
                    dbfirst.Name = item.Name;
                    dbfirst.FactoryArea = item.FactoryArea;
                    _warehouseArearepository.UpdateData(dbfirst);
                  var first=  _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().First(x => x.Code == item.Code);
                    if(first != null)
                    {
                        _warehouseArearepository.DeleteData(first);
                    }
                }
                else
                {
                    _warehouseArearepository.AddData(new Dt_WarehouseArea { Code=item.Code,Name=item.Name,FactoryArea=item.FactoryArea});
                    var dbfirst = lists.FirstOrDefault(x => x.Code == item.Code);
                    if (dbfirst != null)
                    {
                        dbfirst.Code = item.Code;
                        dbfirst.Name = item.Name;
                        dbfirst.FactoryArea = item.FactoryArea;
                        _warehouseArearepository.UpdateData(dbfirst);
                    }
                    else
                    {
                        _warehouseArearepository.AddData(new Dt_WarehouseArea { Code = item.Code, Name = item.Name, FactoryArea = item.FactoryArea });
                    }
                }
            }
            return WebResponseContent.Instance.OK();

        }

        public List<WarehouseDTO> GetWarehouseTypes()
        {
            return _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().Select(x => new WarehouseDTO
            {
                WarehouseType = x.Code,
                WarehouseTypeDesc = $"{x.Code}-{x.Name}"
            }).ToList();
        }
    }

}