zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改完毕

集成Redis
郑勃旭 1 year ago
parent
666c227f7f
commit
1585da1862
20 changed files with 527 additions and 725 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs
  2. 6
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json
  3. 18
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs
  4. 23
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs
  5. 4
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs
  6. 18
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs
  7. 6
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs
  8. 6
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs
  9. 11
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs
  10. 16
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs
  11. 16
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs
  12. 62
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json
  13. 57
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json
  14. 2
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs
  15. 18
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs
  16. 6
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs
  17. 5
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs
  18. 86
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs
  19. 4
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs
  20. 2
      WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json

4
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Volo.Abp;
@ -16,6 +17,7 @@ namespace WinIn.FasterZ.AuthSiteCenter.Web.Controllers;
[ApiController]
[Route("CustAccount")]
[AllowAnonymous]
public class CustAccountController : AbpController
{
private readonly IdentityUserManager _userManager;
@ -28,7 +30,7 @@ public class CustAccountController : AbpController
_httpClientFactory = httpClientFactory;
_configuration = configuration;
}
[AllowAnonymous]
[HttpPost("login")]
public async Task<LoginOutput> LoginAsync([FromBody]LoginInput input)
{

6
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json
View File

@ -1,9 +1,9 @@
{
"App": {
"SelfUrl": "http://192.168.0.240:60080",
"ClientUrl": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075",
"CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075",
"RedirectAllowedUrls": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075"
"ClientUrl": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075",
"CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075",
"RedirectAllowedUrls": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075"
},
"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Faster_AuthSiteCenter;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;"

18
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs
View File

@ -107,10 +107,10 @@ namespace WinIn.FasterZ.Wms.Permissions
storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Update, L("Permission:Update"));
storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Delete, L("Permission:Delete"));
var storeTransferNoteDetailCopyPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteDetail.Default, L("Permission:StoreTransferNoteDetailCopy"));
storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Create, L("Permission:Create"));
storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Update, L("Permission:Update"));
storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Delete, L("Permission:Delete"));
var storeTransferNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteDetail.Default, L("Permission:StoreTransferNoteDetail"));
storeTransferNoteDetailPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Create, L("Permission:Create"));
storeTransferNoteDetailPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Update, L("Permission:Update"));
storeTransferNoteDetailPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Delete, L("Permission:Delete"));
var storeTransferNotePermission = myGroup.AddPermission(WmsPermissions.StoreTransferNote.Default, L("Permission:StoreTransferNote"));
storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Create, L("Permission:Create"));
@ -547,21 +547,11 @@ namespace WinIn.FasterZ.Wms.Permissions
storeCountPlanPermission.AddChild(WmsPermissions.StoreCountPlan.Update, L("Permission:Update"));
storeCountPlanPermission.AddChild(WmsPermissions.StoreCountPlan.Delete, L("Permission:Delete"));
var storeCountNoteDetailCopyPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteDetailCopy.Default, L("Permission:StoreCountNoteDetailCopy"));
storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Create, L("Permission:Create"));
storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Update, L("Permission:Update"));
storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Delete, L("Permission:Delete"));
var storeCountNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteDetail.Default, L("Permission:StoreCountNoteDetail"));
storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Create, L("Permission:Create"));
storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Update, L("Permission:Update"));
storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Delete, L("Permission:Delete"));
var storeCountNoteCopyPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteCopy.Default, L("Permission:StoreCountNoteCopy"));
storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Create, L("Permission:Create"));
storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Update, L("Permission:Update"));
storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Delete, L("Permission:Delete"));
var storeCountNotePermission = myGroup.AddPermission(WmsPermissions.StoreCountNote.Default, L("Permission:StoreCountNote"));
storeCountNotePermission.AddChild(WmsPermissions.StoreCountNote.Create, L("Permission:Create"));
storeCountNotePermission.AddChild(WmsPermissions.StoreCountNote.Update, L("Permission:Update"));

23
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs
View File

@ -149,7 +149,7 @@ namespace WinIn.FasterZ.Wms.Permissions
}
public class StoreTransferNoteDetail
{
public const string Default = GroupName + ".StoreTransferNoteDetailCopy";
public const string Default = GroupName + ".StoreTransferNoteDetail";
public const string Update = Default + ".Update";
public const string Create = Default + ".Create";
public const string Delete = Default + ".Delete";
@ -924,16 +924,6 @@ namespace WinIn.FasterZ.Wms.Permissions
/// <summary>
///
/// </summary>
public class StoreCountNoteDetailCopy
{
public const string Default = GroupName + ".StoreCountNoteDetailCopy";
public const string Update = Default + ".Update";
public const string Create = Default + ".Create";
public const string Delete = Default + ".Delete";
}
/// <summary>
///
/// </summary>
public class StoreCountNoteDetail
{
public const string Default = GroupName + ".StoreCountNoteDetail";
@ -941,16 +931,7 @@ namespace WinIn.FasterZ.Wms.Permissions
public const string Create = Default + ".Create";
public const string Delete = Default + ".Delete";
}
/// <summary>
///
/// </summary>
public class StoreCountNoteCopy
{
public const string Default = GroupName + ".StoreCountNoteCopy";
public const string Update = Default + ".Update";
public const string Create = Default + ".Create";
public const string Delete = Default + ".Delete";
}
/// <summary>
///
/// </summary>

4
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs
View File

@ -123,12 +123,12 @@ public class CreateUpdateLabelInventoryLabelDto
/// <summary>
///
/// </summary>
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
/// <summary>
///
/// </summary>
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
/// <summary>
///

18
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs
View File

@ -87,37 +87,37 @@ public class LabelInventoryLabelDto : AuditedEntityDto<Guid>
/// <summary>
///
/// </summary>
public string? ProductionInfoProdLine { get; set; }
public string? ProductionInfo_ProdLine { get; set; }
/// <summary>
///
/// </summary>
public string? ProductionInfoShift { get; set; }
public string? ProductionInfo_Shift { get; set; }
/// <summary>
///
/// </summary>
public string? ProductionInfoTeam { get; set; }
public string? ProductionInfo_Team { get; set; }
/// <summary>
///
/// </summary>
public string? PurchaseInfoAsnNumber { get; set; }
public string? PurchaseInfo_AsnNumber { get; set; }
/// <summary>
///
/// </summary>
public string? PurchaseInfoPoNumber { get; set; }
public string? PurchaseInfo_PoNumber { get; set; }
/// <summary>
///
/// </summary>
public string? PurchaseInfoRpNumber { get; set; }
public string? PurchaseInfo_RpNumber { get; set; }
/// <summary>
///
/// </summary>
public string? PurchaseInfoSupplierCode { get; set; }
public string? PurchaseInfo_SupplierCode { get; set; }
/// <summary>
///
@ -127,12 +127,12 @@ public class LabelInventoryLabelDto : AuditedEntityDto<Guid>
/// <summary>
///
/// </summary>
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
/// <summary>
///
/// </summary>
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
/// <summary>
///

6
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs
View File

@ -83,12 +83,12 @@ public class CreateUpdateLabelSaleLabelDto
/// <summary>
///
/// </summary>
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
/// <summary>
///
/// </summary>
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
/// <summary>
///
@ -98,7 +98,7 @@ public class CreateUpdateLabelSaleLabelDto
/// <summary>
///
/// </summary>
public string? SaleInfoSaleInfoName { get; set; }
public string? SaleInfo_SaleInfoName { get; set; }
/// <summary>
///

6
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs
View File

@ -87,12 +87,12 @@ public class LabelSaleLabelDto : AuditedEntityDto<Guid>
/// <summary>
///
/// </summary>
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
/// <summary>
///
/// </summary>
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
/// <summary>
///
@ -102,7 +102,7 @@ public class LabelSaleLabelDto : AuditedEntityDto<Guid>
/// <summary>
///
/// </summary>
public string? SaleInfoSaleInfoName { get; set; }
public string? SaleInfo_SaleInfoName { get; set; }
/// <summary>
///

11
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs
View File

@ -1,4 +1,5 @@
using Volo.Abp.Identity;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Identity;
namespace WinIn.FasterZ.Wms.AppBase;
@ -9,6 +10,7 @@ using System.IO;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Linq.Expressions;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
@ -545,8 +547,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
Console.WriteLine();
Console.WriteLine("---------查询结束---------");
var result = await entities.PageBy(skipCount, maxResultCount).ToListAsync(cancellationToken)
.ConfigureAwait(false);
var result = entities.Skip(skipCount).Take(maxResultCount).ToList();
return result;
}
@ -561,10 +562,10 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
{
if (string.IsNullOrEmpty(sorting))
{
var createTimePropertyInfo = typeof(TEntity).GetProperty("CreationTime");
var createTimePropertyInfo = typeof(TEntity).GetProperty(nameof(AuditedEntity.CreationTime));
if (createTimePropertyInfo != null)
{
entities = entities.OrderBy("CreationTime DESC");
entities = entities.OrderBy(nameof(AuditedEntity.CreationTime) +" DESC");
}
else
{

16
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs
View File

@ -16,7 +16,7 @@ namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting
/// <summary>
/// 用户个型导出配置
/// </summary>
public class ExportCustomUserSettingAppService : ZbxBase<ExportCustomUserSetting, ExportCustomUserSettingDto, Guid,
public class ExportCustomUserSettingAppService : CrudAppService<ExportCustomUserSetting, ExportCustomUserSettingDto, Guid,
ExportCustomUserSettingGetListInput, CreateUpdateExportCustomUserSettingDto,
CreateUpdateExportCustomUserSettingDto>,
IExportCustomUserSettingAppService
@ -48,19 +48,5 @@ namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting
return ObjectMapper.Map<List<ExportCustomUserSetting>, List<ExportCustomUserSettingDto>>(entitys);
}
protected override async Task<IQueryable<ExportCustomUserSetting>> CreateFilteredQueryAsync(
ExportCustomUserSettingGetListInput input)
{
// TODO: AbpHelper generated
return (await base.CreateFilteredQueryAsync(input))
.WhereIf(input.ExportUserId != null, x => x.ExportUserId == input.ExportUserId)
.WhereIf(!input.ExportUserName.IsNullOrWhiteSpace(), x => x.ExportUserName.Contains(input.ExportUserName))
.WhereIf(!input.ExportColumnName.IsNullOrWhiteSpace(),
x => x.ExportColumnName.Contains(input.ExportColumnName))
.WhereIf(!input.ExportTableName.IsNullOrWhiteSpace(),
x => x.ExportTableName.Contains(input.ExportTableName))
.WhereIf(input.CustomUserSetting != null, x => x.CustomUserSetting == input.CustomUserSetting)
;
}
}
}

16
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs
View File

@ -36,10 +36,6 @@ using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail;
@ -214,12 +210,8 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNote;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNote.Dtos;
using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail;
@ -437,6 +429,8 @@ using WinIn.FasterZ.Wms.Z_Business.AuthUserMenu.Dtos;
using WinIn.FasterZ.Wms.Z_Business.AuthMenu;
using WinIn.FasterZ.Wms.Z_Business.AuthMenu.Dtos;
using AutoMapper;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos;
namespace WinIn.FasterZ.Wms
{
@ -487,6 +481,8 @@ namespace WinIn.FasterZ.Wms
CreateMap<CreateUpdateStoreTransferRequestDto, StoreTransferRequest>(MemberList.Source);
CreateMap<StoreTransferNote, StoreTransferNoteDto>();
CreateMap<CreateUpdateStoreTransferNoteDto, StoreTransferNote>(MemberList.Source);
CreateMap<StoreTransferNoteDetail, StoreTransferNoteDetailDto>();
CreateMap<CreateUpdateStoreTransferNoteDto, StoreTransferNote>(MemberList.Source);
CreateMap<StoreSupplierAsnDetail, StoreSupplierAsnDetailDto>();
CreateMap<CreateUpdateStoreSupplierAsnDetailDto, StoreSupplierAsnDetail>(MemberList.Source);
CreateMap<StoreSupplierAsn, StoreSupplierAsnDto>();
@ -659,12 +655,8 @@ namespace WinIn.FasterZ.Wms
CreateMap<CreateUpdateStoreCountPlanDetailDto, StoreCountPlanDetail>(MemberList.Source);
CreateMap<StoreCountPlan, StoreCountPlanDto>();
CreateMap<CreateUpdateStoreCountPlanDto, StoreCountPlan>(MemberList.Source);
CreateMap<StoreCountNoteDetailCopy, StoreCountNoteDetailCopyDto>();
CreateMap<CreateUpdateStoreCountNoteDetailCopyDto, StoreCountNoteDetailCopy>(MemberList.Source);
CreateMap<StoreCountNoteDetail, StoreCountNoteDetailDto>();
CreateMap<CreateUpdateStoreCountNoteDetailDto, StoreCountNoteDetail>(MemberList.Source);
CreateMap<StoreCountNoteCopy, StoreCountNoteCopyDto>();
CreateMap<CreateUpdateStoreCountNoteCopyDto, StoreCountNoteCopy>(MemberList.Source);
CreateMap<StoreCountNote, StoreCountNoteDto>();
CreateMap<CreateUpdateStoreCountNoteDto, StoreCountNote>(MemberList.Source);
CreateMap<StoreCountAdjustRequestDetail, StoreCountAdjustRequestDetailDto>();

62
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json
View File

@ -557,63 +557,6 @@
"CreateStoreTransferRequest": "CreateStoreTransferRequest",
"EditStoreTransferRequest": "EditStoreTransferRequest",
"StoreTransferRequestDeletionConfirmationMessage": "Are you sure to delete the storeTransferRequest {0}?",
"Permission:StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy",
"Menu:StoreTransferNoteDetailCopy": "MenuStoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopyArriveDate": "StoreTransferNoteDetailCopyArriveDate",
"StoreTransferNoteDetailCopyExpireDate": "StoreTransferNoteDetailCopyExpireDate",
"StoreTransferNoteDetailCopyFromContainerCode": "StoreTransferNoteDetailCopyFromContainerCode",
"StoreTransferNoteDetailCopyFromLocationArea": "StoreTransferNoteDetailCopyFromLocationArea",
"StoreTransferNoteDetailCopyFromLocationCode": "StoreTransferNoteDetailCopyFromLocationCode",
"StoreTransferNoteDetailCopyFromLocationErpCode": "StoreTransferNoteDetailCopyFromLocationErpCode",
"StoreTransferNoteDetailCopyFromLocationGroup": "StoreTransferNoteDetailCopyFromLocationGroup",
"StoreTransferNoteDetailCopyFromLot": "StoreTransferNoteDetailCopyFromLot",
"StoreTransferNoteDetailCopyFromPackingCode": "StoreTransferNoteDetailCopyFromPackingCode",
"StoreTransferNoteDetailCopyFromStatus": "StoreTransferNoteDetailCopyFromStatus",
"StoreTransferNoteDetailCopyFromWarehouseCode": "StoreTransferNoteDetailCopyFromWarehouseCode",
"StoreTransferNoteDetailCopyItemCode": "StoreTransferNoteDetailCopyItemCode",
"StoreTransferNoteDetailCopyItemDesc1": "StoreTransferNoteDetailCopyItemDesc1",
"StoreTransferNoteDetailCopyItemDesc2": "StoreTransferNoteDetailCopyItemDesc2",
"StoreTransferNoteDetailCopyItemName": "StoreTransferNoteDetailCopyItemName",
"StoreTransferNoteDetailCopyMaster": "StoreTransferNoteDetailCopyMaster",
"StoreTransferNoteDetailCopyMasterId": "StoreTransferNoteDetailCopyMasterId",
"StoreTransferNoteDetailCopyNumber": "StoreTransferNoteDetailCopyNumber",
"StoreTransferNoteDetailCopyOnTheWayLocationCode": "StoreTransferNoteDetailCopyOnTheWayLocationCode",
"StoreTransferNoteDetailCopyProduceDate": "StoreTransferNoteDetailCopyProduceDate",
"StoreTransferNoteDetailCopyQty": "StoreTransferNoteDetailCopyQty",
"StoreTransferNoteDetailCopyReason": "StoreTransferNoteDetailCopyReason",
"StoreTransferNoteDetailCopyRemark": "StoreTransferNoteDetailCopyRemark",
"StoreTransferNoteDetailCopyStdPackQty": "StoreTransferNoteDetailCopyStdPackQty",
"StoreTransferNoteDetailCopySupplierBatch": "StoreTransferNoteDetailCopySupplierBatch",
"StoreTransferNoteDetailCopyToContainerCode": "StoreTransferNoteDetailCopyToContainerCode",
"StoreTransferNoteDetailCopyToLocationArea": "StoreTransferNoteDetailCopyToLocationArea",
"StoreTransferNoteDetailCopyToLocationCode": "StoreTransferNoteDetailCopyToLocationCode",
"StoreTransferNoteDetailCopyToLocationErpCode": "StoreTransferNoteDetailCopyToLocationErpCode",
"StoreTransferNoteDetailCopyToLocationGroup": "StoreTransferNoteDetailCopyToLocationGroup",
"StoreTransferNoteDetailCopyToLot": "StoreTransferNoteDetailCopyToLot",
"StoreTransferNoteDetailCopyToPackingCode": "StoreTransferNoteDetailCopyToPackingCode",
"StoreTransferNoteDetailCopyToStatus": "StoreTransferNoteDetailCopyToStatus",
"StoreTransferNoteDetailCopyToWarehouseCode": "StoreTransferNoteDetailCopyToWarehouseCode",
"StoreTransferNoteDetailCopyUom": "StoreTransferNoteDetailCopyUom",
"CreateStoreTransferNoteDetailCopy": "CreateStoreTransferNoteDetailCopy",
"EditStoreTransferNoteDetailCopy": "EditStoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteDetailCopy {0}?",
"Permission:StoreTransferNoteCopy": "StoreTransferNoteCopy",
"Menu:StoreTransferNoteCopy": "MenuStoreTransferNoteCopy",
"StoreTransferNoteCopy": "StoreTransferNoteCopy",
"StoreTransferNoteCopyActiveDate": "StoreTransferNoteCopyActiveDate",
"StoreTransferNoteCopyConfirmed": "StoreTransferNoteCopyConfirmed",
"StoreTransferNoteCopyConfirmTime": "StoreTransferNoteCopyConfirmTime",
"StoreTransferNoteCopyJobNumber": "StoreTransferNoteCopyJobNumber",
"StoreTransferNoteCopyNumber": "StoreTransferNoteCopyNumber",
"StoreTransferNoteCopyRemark": "StoreTransferNoteCopyRemark",
"StoreTransferNoteCopyRequestNumber": "StoreTransferNoteCopyRequestNumber",
"StoreTransferNoteCopyType": "StoreTransferNoteCopyType",
"StoreTransferNoteCopyUseOnTheWayLocation": "StoreTransferNoteCopyUseOnTheWayLocation",
"StoreTransferNoteCopyWorker": "StoreTransferNoteCopyWorker",
"CreateStoreTransferNoteCopy": "CreateStoreTransferNoteCopy",
"EditStoreTransferNoteCopy": "EditStoreTransferNoteCopy",
"StoreTransferNoteCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteCopy {0}?",
"Permission:StoreTransferNote": "StoreTransferNote",
"Menu:StoreTransferNote": "MenuStoreTransferNote",
"StoreTransferNote": "StoreTransferNote",
@ -624,7 +567,6 @@
"StoreTransferNoteNumber": "StoreTransferNoteNumber",
"StoreTransferNoteRemark": "StoreTransferNoteRemark",
"StoreTransferNoteRequestNumber": "StoreTransferNoteRequestNumber",
"StoreTransferNoteStoreTransferNoteDetailCopies": "StoreTransferNoteStoreTransferNoteDetailCopies",
"StoreTransferNoteStoreTransferNoteDetails": "StoreTransferNoteStoreTransferNoteDetails",
"StoreTransferNoteType": "StoreTransferNoteType",
"StoreTransferNoteUseOnTheWayLocation": "StoreTransferNoteUseOnTheWayLocation",
@ -3606,7 +3548,7 @@
"LabelSaleLabelProduceDate": "LabelSaleLabelProduceDate",
"LabelSaleLabelQty": "LabelSaleLabelQty",
"LabelSaleLabelQualityInfoQlevel": "LabelSaleLabelQualityInfoQlevel",
"LabelSaleLabelQualityInfoQualityFile": "LabelSaleLabelQualityInfoQualityFile",
"LabelSaleLabelQualityInfo_QualityFile": "LabelSaleLabelQualityInfo_QualityFile",
"LabelSaleLabelRemark": "LabelSaleLabelRemark",
"LabelSaleLabelSaleInfoSaleInfoName": "LabelSaleLabelSaleInfoSaleInfoName",
"LabelSaleLabelStdPackQty": "LabelSaleLabelStdPackQty",
@ -3681,7 +3623,7 @@
"LabelInventoryLabelPurchaseInfoSupplierCode": "LabelInventoryLabelPurchaseInfoSupplierCode",
"LabelInventoryLabelQty": "LabelInventoryLabelQty",
"LabelInventoryLabelQualityInfoQlevel": "LabelInventoryLabelQualityInfoQlevel",
"LabelInventoryLabelQualityInfoQualityFile": "LabelInventoryLabelQualityInfoQualityFile",
"LabelInventoryLabelQualityInfo_QualityFile": "LabelInventoryLabelQualityInfo_QualityFile",
"LabelInventoryLabelRecommendLocationCode": "LabelInventoryLabelRecommendLocationCode",
"LabelInventoryLabelRemark": "LabelInventoryLabelRemark",
"LabelInventoryLabelSpecifications": "LabelInventoryLabelSpecifications",

57
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json
View File

@ -558,63 +558,6 @@
"CreateStoreTransferRequest": "CreateStoreTransferRequest",
"EditStoreTransferRequest": "EditStoreTransferRequest",
"StoreTransferRequestDeletionConfirmationMessage": "Are you sure to delete the storeTransferRequest {0}?",
"Permission:StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy",
"Menu:StoreTransferNoteDetailCopy": "MenuStoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopyArriveDate": "StoreTransferNoteDetailCopyArriveDate",
"StoreTransferNoteDetailCopyExpireDate": "StoreTransferNoteDetailCopyExpireDate",
"StoreTransferNoteDetailCopyFromContainerCode": "StoreTransferNoteDetailCopyFromContainerCode",
"StoreTransferNoteDetailCopyFromLocationArea": "StoreTransferNoteDetailCopyFromLocationArea",
"StoreTransferNoteDetailCopyFromLocationCode": "StoreTransferNoteDetailCopyFromLocationCode",
"StoreTransferNoteDetailCopyFromLocationErpCode": "StoreTransferNoteDetailCopyFromLocationErpCode",
"StoreTransferNoteDetailCopyFromLocationGroup": "StoreTransferNoteDetailCopyFromLocationGroup",
"StoreTransferNoteDetailCopyFromLot": "StoreTransferNoteDetailCopyFromLot",
"StoreTransferNoteDetailCopyFromPackingCode": "StoreTransferNoteDetailCopyFromPackingCode",
"StoreTransferNoteDetailCopyFromStatus": "StoreTransferNoteDetailCopyFromStatus",
"StoreTransferNoteDetailCopyFromWarehouseCode": "StoreTransferNoteDetailCopyFromWarehouseCode",
"StoreTransferNoteDetailCopyItemCode": "StoreTransferNoteDetailCopyItemCode",
"StoreTransferNoteDetailCopyItemDesc1": "StoreTransferNoteDetailCopyItemDesc1",
"StoreTransferNoteDetailCopyItemDesc2": "StoreTransferNoteDetailCopyItemDesc2",
"StoreTransferNoteDetailCopyItemName": "StoreTransferNoteDetailCopyItemName",
"StoreTransferNoteDetailCopyMaster": "StoreTransferNoteDetailCopyMaster",
"StoreTransferNoteDetailCopyMasterId": "StoreTransferNoteDetailCopyMasterId",
"StoreTransferNoteDetailCopyNumber": "StoreTransferNoteDetailCopyNumber",
"StoreTransferNoteDetailCopyOnTheWayLocationCode": "StoreTransferNoteDetailCopyOnTheWayLocationCode",
"StoreTransferNoteDetailCopyProduceDate": "StoreTransferNoteDetailCopyProduceDate",
"StoreTransferNoteDetailCopyQty": "StoreTransferNoteDetailCopyQty",
"StoreTransferNoteDetailCopyReason": "StoreTransferNoteDetailCopyReason",
"StoreTransferNoteDetailCopyRemark": "StoreTransferNoteDetailCopyRemark",
"StoreTransferNoteDetailCopyStdPackQty": "StoreTransferNoteDetailCopyStdPackQty",
"StoreTransferNoteDetailCopySupplierBatch": "StoreTransferNoteDetailCopySupplierBatch",
"StoreTransferNoteDetailCopyToContainerCode": "StoreTransferNoteDetailCopyToContainerCode",
"StoreTransferNoteDetailCopyToLocationArea": "StoreTransferNoteDetailCopyToLocationArea",
"StoreTransferNoteDetailCopyToLocationCode": "StoreTransferNoteDetailCopyToLocationCode",
"StoreTransferNoteDetailCopyToLocationErpCode": "StoreTransferNoteDetailCopyToLocationErpCode",
"StoreTransferNoteDetailCopyToLocationGroup": "StoreTransferNoteDetailCopyToLocationGroup",
"StoreTransferNoteDetailCopyToLot": "StoreTransferNoteDetailCopyToLot",
"StoreTransferNoteDetailCopyToPackingCode": "StoreTransferNoteDetailCopyToPackingCode",
"StoreTransferNoteDetailCopyToStatus": "StoreTransferNoteDetailCopyToStatus",
"StoreTransferNoteDetailCopyToWarehouseCode": "StoreTransferNoteDetailCopyToWarehouseCode",
"StoreTransferNoteDetailCopyUom": "StoreTransferNoteDetailCopyUom",
"CreateStoreTransferNoteDetailCopy": "CreateStoreTransferNoteDetailCopy",
"EditStoreTransferNoteDetailCopy": "EditStoreTransferNoteDetailCopy",
"StoreTransferNoteDetailCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteDetailCopy {0}?",
"Permission:StoreTransferNoteCopy": "StoreTransferNoteCopy",
"Menu:StoreTransferNoteCopy": "MenuStoreTransferNoteCopy",
"StoreTransferNoteCopy": "StoreTransferNoteCopy",
"StoreTransferNoteCopyActiveDate": "StoreTransferNoteCopyActiveDate",
"StoreTransferNoteCopyConfirmed": "StoreTransferNoteCopyConfirmed",
"StoreTransferNoteCopyConfirmTime": "StoreTransferNoteCopyConfirmTime",
"StoreTransferNoteCopyJobNumber": "StoreTransferNoteCopyJobNumber",
"StoreTransferNoteCopyNumber": "StoreTransferNoteCopyNumber",
"StoreTransferNoteCopyRemark": "StoreTransferNoteCopyRemark",
"StoreTransferNoteCopyRequestNumber": "StoreTransferNoteCopyRequestNumber",
"StoreTransferNoteCopyType": "StoreTransferNoteCopyType",
"StoreTransferNoteCopyUseOnTheWayLocation": "StoreTransferNoteCopyUseOnTheWayLocation",
"StoreTransferNoteCopyWorker": "StoreTransferNoteCopyWorker",
"CreateStoreTransferNoteCopy": "CreateStoreTransferNoteCopy",
"EditStoreTransferNoteCopy": "EditStoreTransferNoteCopy",
"StoreTransferNoteCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteCopy {0}?",
"Permission:StoreTransferNote": "StoreTransferNote",
"Menu:StoreTransferNote": "MenuStoreTransferNote",
"StoreTransferNote": "StoreTransferNote",

2
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs
View File

@ -6,7 +6,7 @@
using WinIn.FasterZ.Wms.Z_Business.BasedataDict;
public class BasedataDictItem : AuditedAggregateRoot<Guid>
public class BasedataDictItem : AuditedEntity<Guid>
{
public string Code { get; set; } = null!;

18
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs
View File

@ -36,25 +36,25 @@
public DateTime ProduceDate { get; set; }
public string? ProductionInfoProdLine { get; set; }
public string? ProductionInfo_ProdLine { get; set; }
public string? ProductionInfoShift { get; set; }
public string? ProductionInfo_Shift { get; set; }
public string? ProductionInfoTeam { get; set; }
public string? ProductionInfo_Team { get; set; }
public string? PurchaseInfoAsnNumber { get; set; }
public string? PurchaseInfo_AsnNumber { get; set; }
public string? PurchaseInfoPoNumber { get; set; }
public string? PurchaseInfo_PoNumber { get; set; }
public string? PurchaseInfoRpNumber { get; set; }
public string? PurchaseInfo_RpNumber { get; set; }
public string? PurchaseInfoSupplierCode { get; set; }
public string? PurchaseInfo_SupplierCode { get; set; }
public decimal Qty { get; set; }
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
public string? RecommendLocationCode { get; set; }

6
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs
View File

@ -36,13 +36,13 @@
public decimal Qty { get; set; }
public string? QualityInfoQlevel { get; set; }
public string? QualityInfo_Qlevel { get; set; }
public string? QualityInfoQualityFile { get; set; }
public string? QualityInfo_QualityFile { get; set; }
public string? Remark { get; set; }
public string? SaleInfoSaleInfoName { get; set; }
public string? SaleInfo_SaleInfoName { get; set; }
public decimal StdPackQty { get; set; }

5
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs
View File

@ -6,7 +6,6 @@
using Volo.Abp.Domain.Entities.Auditing;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy;
public class StoreCountNote : AuditedAggregateRoot<Guid>
{
@ -28,10 +27,8 @@
public string Stage { get; set; } = null!;
public virtual List<StoreCountNoteDetailCopy> StoreCountNoteDetailCopies { get; set; } =
new List<StoreCountNoteDetailCopy>();
public virtual List<StoreCountNoteDetail> StoreCountNoteDetails { get; set; } =
public virtual List<StoreCountNoteDetail> Detalis { get; set; } =
new List<StoreCountNoteDetail>();
public string Type { get; set; } = null!;

86
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs
View File

@ -123,9 +123,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNote;
using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest;
@ -541,18 +539,10 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
/// <summary>
///
/// </summary>
public DbSet<StoreCountNoteDetailCopy> StoreCountNoteDetailCopies { get; set; }
/// <summary>
///
/// </summary>
public DbSet<StoreCountNoteDetail> StoreCountNoteDetails { get; set; }
/// <summary>
///
/// </summary>
public DbSet<StoreCountNoteCopy> StoreCountNoteCopies { get; set; }
/// <summary>
///
/// </summary>
public DbSet<StoreCountNote> StoreCountNotes { get; set; }
/// <summary>
///
@ -925,7 +915,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
/// <summary>
///
/// </summary>
public DbSet<BasedataDictItem> BasedataDictItems { get; set; }
public DbSet<BasedataDictItem> BasedataDictItem { get; set; }
/// <summary>
///
/// </summary>
@ -1024,7 +1014,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<AuthDepartment>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema);
b.ToTable(WmsConsts.DbTablePrefix + "Auth__Department", WmsConsts.DbSchema);
b.ConfigureByConvention();
@ -2100,16 +2090,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
});
builder.Entity<StoreCountNoteDetailCopy>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteDetailCopie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
/* Configure more properties here */
});
builder.Entity<StoreCountNoteDetail>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteDetail", WmsConsts.DbSchema, table => table.HasComment(""));
@ -2120,14 +2100,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
});
builder.Entity<StoreCountNoteCopy>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteCopie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
/* Configure more properties here */
});
builder.Entity<StoreCountNote>(b =>
@ -2222,7 +2194,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessageUserNotifyMessage>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessageUserNotifyMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_UserNotifyMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2232,7 +2204,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessagePrivateMessage>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessagePrivateMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_PrivateMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2242,7 +2214,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessageNotifyMessage>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessageNotifyMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_NotifyMessage", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2252,7 +2224,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessageMessageTypeSubscribe>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessageMessageTypeSubscribe", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_MessageTypeSubscribe", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2262,7 +2234,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessageMessageType>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessageMessageType", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_MessageType", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2272,7 +2244,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<MessageAnnouncement>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "MessageAnnouncement", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Message_Announcement", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2622,7 +2594,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryTransferLog>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryTransferLog", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_TransferLog", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2632,7 +2604,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryTransaction>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryTransaction", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Transaction", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2642,7 +2614,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventorySnapshot>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventorySnapshot", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Snapshot", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2652,7 +2624,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryLocationCapacity>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryLocationCapacitie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_LocationCapacity", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2662,7 +2634,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryExpectOut>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryExpectOut", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ExpectOut", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2672,7 +2644,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryExpectIn>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryExpectIn", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ExpectIn", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2682,7 +2654,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryErpBalance>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryErpBalance", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ErpBalance", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2692,7 +2664,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryContainerDetail>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryContainerDetail", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ContainerDetail", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2702,7 +2674,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryContainer>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryContainer", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Container", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2712,7 +2684,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<InventoryBalance>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "InventoryBalance", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Balance", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2722,7 +2694,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<FileStorageFile>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "FileStorageFile", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_File", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2732,7 +2704,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<FileStorageDataImportTask>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "FileStorageDataImportTask", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_DataImportTask", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2742,7 +2714,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<FileStorageDataExportTask>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "FileStorageDataExportTask", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_DataExportTask", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -2972,7 +2944,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<BasedataItemQuality>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemQualitie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemQuality", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3002,7 +2974,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<BasedataItemCategory>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemCategorie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemCategory", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3092,7 +3064,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<BasedataCustomerAddress>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_CustomerAddresse", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_CustomerAddress", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3122,7 +3094,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<BasedataCurrency>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Currencie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Currency", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3132,7 +3104,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<BasedataCategory>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Categorie", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Category", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3182,7 +3154,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<AuthUserWorkGroup>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "AuthUserWorkGroup", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Auth_UserWorkGroup", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3192,7 +3164,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<AuthUserMenu>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "AuthUserMenu", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Auth_UserMenu", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();
@ -3202,7 +3174,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
builder.Entity<AuthMenu>(b =>
{
b.ToTable(WmsConsts.DbTablePrefix + "AuthMenu", WmsConsts.DbSchema, table => table.HasComment(""));
b.ToTable(WmsConsts.DbTablePrefix + "Auth_Menu", WmsConsts.DbSchema, table => table.HasComment(""));
b.ConfigureByConvention();

4
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs
View File

@ -106,9 +106,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest;
using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNote;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan;
using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail;
using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn;
@ -371,9 +369,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore
options.AddRepository<StoreCustomerAsn, StoreCustomerAsnRepository>();
options.AddRepository<StoreCountPlanDetail, StoreCountPlanDetailRepository>();
options.AddRepository<StoreCountPlan, StoreCountPlanRepository>();
options.AddRepository<StoreCountNoteDetailCopy, StoreCountNoteDetailCopyRepository>();
options.AddRepository<StoreCountNoteDetail, StoreCountNoteDetailRepository>();
options.AddRepository<StoreCountNoteCopy, StoreCountNoteCopyRepository>();
options.AddRepository<StoreCountNote, StoreCountNoteRepository>();
options.AddRepository<StoreCountAdjustRequestDetail, StoreCountAdjustRequestDetailRepository>();
options.AddRepository<StoreCountAdjustRequest, StoreCountAdjustRequestRepository>();

2
WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json
View File

@ -1,6 +1,6 @@
{
"App": {
"CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075",
"CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075",
"Audit": {
"IsEnabled": false // 禁用审计功能
// 其他审计相关设置项

Write Preview
Loading…
Cancel
Save