liuying
2024-05-09 f4078b75fe80f03e58af3217bf642d0de118d1c9
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
@@ -26,6 +26,8 @@
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly IRepository<WmsWarehouse, MasterDbContextLocator> _wmsWarehouseRep;
        private readonly static object _lock = new();
        public WmsAreaService(
@@ -33,12 +35,14 @@
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
            ,IRepository<WmsWarehouse, MasterDbContextLocator> wmsWarehouseRep
        )
        {
            _wmsAreaRep = wmsAreaRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
         _wmsWarehouseRep = wmsWarehouseRep;
        }
        /// <summary>
@@ -163,7 +167,14 @@
            var wmsArea = input.Adapt<WmsArea>();
                        //验证
            await CheckExisit(wmsArea);
            //所属仓库
            var Info = _wmsWarehouseRep.Where(x => x.Id == input.WarehouseId).FirstOrDefault();
            if (Info == null)
            {
                throw Oops.Oh(errorMessage: @$"所属仓库不存在!");
            }
            wmsArea.WarehouseName = Info.Name;
            wmsArea.WarehouseCode = Info.Code;
            wmsArea.CreatedUserId = wmsArea.UpdatedUserId = SysHelper.GetUserId();
            wmsArea.CreatedUserName = wmsArea.UpdatedUserName = SysHelper.GetUserName();
            wmsArea.CreatedTime = wmsArea.UpdatedTime = SysHelper.GetNowTime();
@@ -382,20 +393,18 @@
                          
                          if(!string.IsNullOrEmpty(_WarehouseId))
                          {
                              if (!long.TryParse(_WarehouseId, out long outWarehouseId)&&!string.IsNullOrEmpty(_WarehouseId))
                          System.Int64  enumWarehouseId = default(System.Int64);
                             if(!Enum.TryParse<System.Int64>(_WarehouseId, out enumWarehouseId)&&!string.IsNullOrEmpty(_WarehouseId))
                              {
                                 throw Oops.Oh($"第{index}行[所属仓库]{_WarehouseId}值不正确!");
                              }
                              if (outWarehouseId <= 0&&!string.IsNullOrEmpty(_WarehouseId))
                              {
                                 throw Oops.Oh($"第{index}行[所属仓库]{_WarehouseId}值不能小于等于0!");
                                throw Oops.Oh($"第{index}行[所属仓库]{_WarehouseId}值不正确!");
                              }
                              else
                              {
                                 addItem.WarehouseId = outWarehouseId;
                                 addItem.WarehouseId = enumWarehouseId;
                              }
                          
                          }
                           }
                          
                          if (string.IsNullOrEmpty(_IsBarcodeLevelControl))
                          {