diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs index f65ed755a..559761089 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/Filters/Condition.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +namespace WinIn.FasterZ.Wms.AppBase.Filters; -namespace WinIn.FasterZ.Store.AppBase.Filters; +using System.Collections.Generic; public class Condition { diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs index ed110b983..b72911f7d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/ISfsRequest.cs @@ -1,7 +1,8 @@ +namespace WinIn.FasterZ.Wms.AppBase; + using Volo.Abp.Application.Dtos; -using WinIn.FasterZ.Store.AppBase.Filters; -namespace WinIn.FasterZ.Store.AppBase; +using WinIn.FasterZ.Wms.AppBase.Filters; public interface ISfsRequest : IPagedAndSortedResultRequest { diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs index 12f5d379c..2c5d2918b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/IZbxBase.cs @@ -1,11 +1,13 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Application.Dtos; - -namespace WinIn.FasterZ.Store.AppBase +namespace WinIn.FasterZ.Wms.AppBase { + using System; + using System.Threading; + using System.Threading.Tasks; + + using Microsoft.AspNetCore.Mvc; + + using Volo.Abp.Application.Dtos; + public interface IZbxBase { Task> GetPageListByFilterAsync(SfsRequestInputBase sfsRequestInputBase, diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs index c4a8db43c..d7b710e00 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBase/SfsRequestInputBase.cs @@ -1,7 +1,8 @@ +namespace WinIn.FasterZ.Wms.AppBase; + using Volo.Abp.Application.Dtos; -using WinIn.FasterZ.Store.AppBase.Filters; -namespace WinIn.FasterZ.Store.AppBase; +using WinIn.FasterZ.Wms.AppBase.Filters; public class SfsRequestInputBase : PagedAndSortedResultRequestDto, ISfsRequest { diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs index b842e0c46..397c36b29 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs @@ -1,4 +1,6 @@ -using System; +namespace WinIn.FasterZ.Wms.AppBase; + +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -7,25 +9,26 @@ using System.Linq.Dynamic.Core; using System.Linq.Expressions; using System.Threading; using System.Threading.Tasks; + using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; + using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; + using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; + +using WinIn.FasterZ.Store.AppBase; using WinIn.FasterZ.Store.AppBase.Filters; using WinIn.FasterZ.Store.AppBase.TableColumnTypeDto; -using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; using WinIn.FasterZ.Store.Enums; using WinIn.FasterZ.Wms.AppBase.Extensions; using WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; - -namespace WinIn.FasterZ.Store.AppBase; - using WinIn.FasterZ.Wms.Localization; public class ZbxBase : diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs index f3e1afd25..2440d5eed 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs @@ -10,6 +10,8 @@ using WinIn.FasterZ.Wms.Permissions; namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting { + using WinIn.FasterZ.Wms.AppBase; + /// /// 用户个型导出配置 ///