Browse Source

新增 底盘信息

dev_DY_CC
郑勃旭 1 year ago
parent
commit
c34fb70e5d
  1. 48
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/EquipmentRecordDTO.cs
  2. 20
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs
  3. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IEquipmentRecordAppService.cs
  4. 48
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordEditInput.cs
  5. 51
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordImportInput.cs
  6. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/IEquipmentRecordAppService.cs
  7. 80
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs
  8. 43
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs
  9. 84
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Equipments/EquipmentRecordAppService.cs
  10. 49
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs
  11. 13
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs
  12. 23
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisManager.cs
  13. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/IChassisManager.cs
  14. 10
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/IChassisRepository.cs
  15. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj
  16. 31
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Chassis/ChassisDbContextModelCreatingExtensions.cs
  17. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Chassis/ChassisEfCoreRepository.cs
  18. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
  19. 30350
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs
  20. 251
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs
  21. 291
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs
  22. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
  23. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
  24. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

48
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/EquipmentRecordDTO.cs

@ -0,0 +1,48 @@
using System;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Application.Contracts;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisDTO : SfsBasicDTOBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

20
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs

@ -0,0 +1,20 @@
using Volo.Abp.Authorization.Permissions;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public static class ChassisPermissions
{
public const string Default = StorePermissions.GroupName + "." + nameof(Chassis);
public const string Create = Default + "." + StorePermissions.CreateStr;
public const string Update = Default + "." + StorePermissions.UpdateStr;
public const string Delete = Default + "." + StorePermissions.DeleteStr;
public static void AddChassisPermission(this PermissionGroupDefinition permissionGroup)
{
var purchaseOrderPermission =
permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(Chassis)));
purchaseOrderPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
purchaseOrderPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
purchaseOrderPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
}
}

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IEquipmentRecordAppService.cs

@ -0,0 +1,12 @@
using Win_in.Sfs.Shared.Application.Contracts;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public interface IChassisAppService
:
ISfsStoreMasterAppServiceBase<ChassisDTO, SfsStoreRequestInputBase, ChassisEditInput, ChassisDTO,
SfsStoreRequestInputBase>,
ISfsCheckStatusAppService
, ISfsUpsertAppService<ChassisEditInput>
{
}

48
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordEditInput.cs

@ -0,0 +1,48 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisEditInput
: SfsStoreCreateOrUpdateInputBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

51
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordImportInput.cs

@ -0,0 +1,51 @@
using System;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisImportInput : SfsStoreImportInputBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/IEquipmentRecordAppService.cs

@ -14,10 +14,4 @@ public interface IEquipmentRecordAppService
, ISfsUpsertAppService<EquipmentRecordEditInput>
{
Task<List<EquipmentRecordErrorDTO>> Bind(List<EquipmentRecord> p_ls);
Task<List<EquipmentRecordErrorDTO>> UnBind(List<EquipmentRecord> p_ls);
}

80
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs

@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Equipments.DTOs;
using Win_in.Sfs.Shared.Application;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Domain.Shared;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Application;
[Authorize]
[Route($"{StoreConsts.RootPath}Chassis")]
public class ChassisAppService
: SfsStoreAppServiceBase<Domain.Chassis, ChassisDTO, SfsStoreRequestInputBase, ChassisEditInput,
ExchangeDataImportInput>
, IChassisAppService
{
private readonly IChassisManager _manager;
public ChassisAppService(
IChassisRepository repository, IChassisManager manager
):base(repository)
{
base.CreatePolicyName = ChassisPermissions.Create;
base.UpdatePolicyName = ChassisPermissions.Update;
base.DeletePolicyName = ChassisPermissions.Delete;
_manager = manager;
}
[NonAction]
public Task<ChassisDTO> GetDetailAsync(Guid id, Guid detailId)
{
throw new NotImplementedException();
}
[NonAction]
public Task<List<ChassisDTO>> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput)
{
throw new NotImplementedException();
}
[NonAction]
public Task AddDetailListAsync(Guid id, List<ChassisDTO> list)
{
throw new NotImplementedException();
}
[NonAction]
public Task UpdateDetailAsync(Guid id, Guid detailId, ChassisDTO updateDTO)
{
throw new NotImplementedException();
}
[NonAction]
public Task CheckStatusAsync(string number)
{
throw new NotImplementedException();
}
[NonAction]
public Task UpsertAsync(ChassisEditInput input)
{
throw new NotImplementedException();
}
}

43
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs

@ -0,0 +1,43 @@
using AutoMapper;
using Volo.Abp.AutoMapper;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Basedata.Domain;
using Win_in.Sfs.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Application;
public partial class StoreApplicationAutoMapperProfile : Profile
{
private void ChassisAutoMapperProfile()
{
CreateMap<Domain.Chassis, ChassisDTO>()
.ReverseMap();
// CreateMap<ExchangeDataCreateInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id)
// ;
// CreateMap<ExchangeDataUpdateInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.Id) ;
// ;
// CreateMap<ExchangeDataImportInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.TenantId)
// //.Ignore(x => x.Remark)
// .Ignore(x => x.ExtraProperties)
// .Ignore(x => x.ConcurrencyStamp)
// ;
// CreateMap<ExchangeData, ExchangeDataImportInput>()
// .Ignore(x => x.ReportStatus)
// .Ignore(x => x.ReportReason)
// ;
// CreateMap<ExchangeData, ExchangeDataExportDTO>()
//;
}
}

84
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Equipments/EquipmentRecordAppService.cs

@ -1,18 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Equipments.DTOs;
using Win_in.Sfs.Shared.Application;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
@ -29,101 +19,49 @@ public class EquipmentRecordAppService
, IEquipmentRecordAppService
{
private readonly IEquipmentRecordManager _manager;
private readonly IEquipmentRecordRepository _repository;
public EquipmentRecordAppService(
IEquipmentRecordRepository repository, IEquipmentRecordManager manager
):base(repository)
IEquipmentRecordRepository repository) : base(repository)
{
base.CreatePolicyName = EquipmentRecordPermissions.Create;
base.UpdatePolicyName = EquipmentRecordPermissions.Update;
base.DeletePolicyName = EquipmentRecordPermissions.Delete;
_manager = manager;
_repository = repository;
}
/// <summary>
/// 绑定器具记录
/// </summary>
/// <param name="p_ls"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
[HttpPost("Bind")]
public Task<List<EquipmentRecordErrorDTO>> Bind(List<EquipmentRecord> p_ls)
{
return _manager.Bind(p_ls);
}
/// <summary>
/// 解绑器具记录
/// </summary>
/// <param name="p_ls"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
[HttpPost("UnBind")]
public Task<List<EquipmentRecordErrorDTO>> UnBind(List<EquipmentRecord> p_ls)
{
return _manager.UnBind(p_ls);
}
#region 无用
/// <summary>
/// 没用
/// </summary>
/// <param name="id"></param>
/// <param name="list"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
[HttpPost("addDetail")]
public Task AddDetailListAsync(Guid id, List<EquipmentRecordDTO> list)
public Task<EquipmentRecordDTO> GetDetailAsync(Guid id, Guid detailId)
{
throw new NotImplementedException();
}
/// <summary>
/// 没用
/// </summary>
[HttpPost("check")]
public Task CheckStatusAsync(string number)
public Task<List<EquipmentRecordDTO>> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput)
{
throw new NotImplementedException();
}
/// <summary>
/// 没用
/// </summary>
[HttpPost("getlist")]
public Task<List<EquipmentRecordDTO>> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput)
public Task AddDetailListAsync(Guid id, List<EquipmentRecordDTO> list)
{
throw new NotImplementedException();
}
/// <summary>
/// 没用
/// </summary>
[HttpPost("updateDetail")]
public Task UpdateDetailAsync(Guid id, Guid detailId, EquipmentRecordDTO updateDTO)
{
throw new NotImplementedException();
}
/// <summary>
/// 没用
/// </summary>
[HttpPost("upsertAsync")]
public Task UpsertAsync(EquipmentRecordEditInput input)
public Task CheckStatusAsync(string number)
{
throw new NotImplementedException();
}
/// <summary>
/// 没用
/// </summary>
[HttpPost("withDetil")]
Task<EquipmentRecordDTO> ISfsReadOnlyWithDetailsAppService<EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordDTO, SfsStoreRequestInputBase>.GetDetailAsync(Guid id, Guid detailId)
public Task UpsertAsync(EquipmentRecordEditInput input)
{
throw new NotImplementedException();
}
#endregion
}

49
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/Chassis.cs

@ -0,0 +1,49 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class Chassis : SfsAggregateRootBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

13
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Chassis;
public class ChassisDetail: SfsStoreDetailEntityBase
{
}

23
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisManager.cs

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Volo.Abp.Domain.Services;
namespace Win_in.Sfs.Wms.Store.Domain;
public class ChassisManager : DomainService, IChassisManager
{
private readonly IChassisRepository _repository;
public ChassisManager(
IChassisRepository repository
)
{
_repository = repository;
}
public Task ImportDataAsync(List<Chassis> entities, List<Chassis> deleteEntities = null)
{
throw new NotImplementedException();
}
}

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/IChassisManager.cs

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Win_in.Sfs.Basedata.Equipments.DTOs;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Domain;
public interface IChassisManager : IBulkImportService<Chassis>
{
}

10
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/IChassisRepository.cs

@ -0,0 +1,10 @@
using System.Threading.Tasks;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Domain;
public interface IChassisRepository : ISfsStoreRepositoryBase<Chassis>, ISfsBulkRepositoryBase<Chassis>
{
}

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj

@ -42,7 +42,6 @@
<ItemGroup>
<Folder Include="Orders" />
<Folder Include="Notes\Chassis\" />
</ItemGroup>
<ItemGroup>

31
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Chassis/ChassisDbContextModelCreatingExtensions.cs

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.Modeling;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public static class ChassisDbContextModelCreatingExtensions
{
public static void ConfigureChassis(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
{
builder.Entity<Domain.Chassis>(b =>
{
//Configure table & schema name
b.ToTable(options.TablePrefix + nameof(Chassis), options.Schema);
//Configure ABP properties
b.ConfigureByConvention();
//Configure Sfs base properties
b.ConfigureSfsStoreBase();
b.Property(q => q.SortNumber).IsRequired();
b.Property(q => q.ChassisNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired();
b.Property(q => q.Number).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired();
b.HasIndex(q => q.ChassisNumber).IsUnique();
b.HasIndex(q => q.SortNumber).IsUnique();
b.HasIndex(q => q.Number).IsUnique();
});
}
}

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Chassis/ChassisEfCoreRepository.cs

@ -0,0 +1,18 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public class ChassisEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, Domain.Chassis>, IChassisRepository, ISfsBulkRepositoryBase<Domain.Chassis>
{
public ChassisEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
{
}
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs

@ -125,5 +125,10 @@ public interface IStoreDbContext : IEfCoreDbContext
#endregion
/// <summary>
/// 底盘信息
/// </summary>
public DbSet<Domain.Chassis> Chassis { get; }
public DbSet<ExchangeData> ExchangeDatas { get; }
}

30350
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs

File diff suppressed because it is too large

251
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs

@ -0,0 +1,251 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Win_in.Sfs.Wms.Store.Migrations
{
public partial class Added_Chassis : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ExpiredTime",
table: "Store_CoatingMaterialRequestDetail");
migrationBuilder.DropColumn(
name: "FromLocationArea",
table: "Store_CoatingMaterialRequestDetail");
migrationBuilder.DropColumn(
name: "WorkStation",
table: "Store_CoatingMaterialRequestDetail");
migrationBuilder.DropColumn(
name: "PreparationPlanNumber",
table: "Store_CoatingMaterialRequest");
migrationBuilder.DropColumn(
name: "ProdLine",
table: "Store_CoatingMaterialRequest");
migrationBuilder.DropColumn(
name: "Workshop",
table: "Store_CoatingMaterialRequest");
migrationBuilder.DropColumn(
name: "ExpiredTime",
table: "Store_AssembleRequestDetail");
migrationBuilder.DropColumn(
name: "FromLocationArea",
table: "Store_AssembleRequestDetail");
migrationBuilder.DropColumn(
name: "WorkStation",
table: "Store_AssembleRequestDetail");
migrationBuilder.DropColumn(
name: "ProdLine",
table: "Store_AssembleRequest");
migrationBuilder.AddColumn<decimal>(
name: "BoxQty",
table: "Store_CoatingMaterialRequestDetail",
type: "decimal(18,6)",
nullable: false,
defaultValue: 0m);
migrationBuilder.AddColumn<decimal>(
name: "BoxQty",
table: "Store_AssembleRequestDetail",
type: "decimal(18,6)",
nullable: false,
defaultValue: 0m);
migrationBuilder.CreateTable(
name: "Job_CountJobDependentDetail",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CountLabel = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
InventoryQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
InventoryLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
CountQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
CountTime = table.Column<DateTime>(type: "datetime2", nullable: true),
CountOperator = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
CountDescription = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
Status = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
ContainerCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
PackingCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Lot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
SupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
ExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
LocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
LocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
LocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
LocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
WarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Job_CountJobDependentDetail", x => x.Id);
table.ForeignKey(
name: "FK_Job_CountJobDependentDetail_Job_CountJob_MasterID",
column: x => x.MasterID,
principalTable: "Job_CountJob",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "Store_Chassis",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
ChassisNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
ProduceDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
ReceiveInterfaceDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
SortNumber = table.Column<long>(type: "bigint", nullable: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Store_Chassis", x => x.Id);
});
migrationBuilder.CreateIndex(
name: "IX_Job_CountJobDependentDetail_MasterID",
table: "Job_CountJobDependentDetail",
column: "MasterID");
migrationBuilder.CreateIndex(
name: "IX_Store_Chassis_ChassisNumber",
table: "Store_Chassis",
column: "ChassisNumber",
unique: true);
migrationBuilder.CreateIndex(
name: "IX_Store_Chassis_Number",
table: "Store_Chassis",
column: "Number",
unique: true);
migrationBuilder.CreateIndex(
name: "IX_Store_Chassis_SortNumber",
table: "Store_Chassis",
column: "SortNumber",
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Job_CountJobDependentDetail");
migrationBuilder.DropTable(
name: "Store_Chassis");
migrationBuilder.DropColumn(
name: "BoxQty",
table: "Store_CoatingMaterialRequestDetail");
migrationBuilder.DropColumn(
name: "BoxQty",
table: "Store_AssembleRequestDetail");
migrationBuilder.AddColumn<DateTime>(
name: "ExpiredTime",
table: "Store_CoatingMaterialRequestDetail",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
migrationBuilder.AddColumn<string>(
name: "FromLocationArea",
table: "Store_CoatingMaterialRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "WorkStation",
table: "Store_CoatingMaterialRequestDetail",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "PreparationPlanNumber",
table: "Store_CoatingMaterialRequest",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProdLine",
table: "Store_CoatingMaterialRequest",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Workshop",
table: "Store_CoatingMaterialRequest",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "ExpiredTime",
table: "Store_AssembleRequestDetail",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
migrationBuilder.AddColumn<string>(
name: "FromLocationArea",
table: "Store_AssembleRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "WorkStation",
table: "Store_AssembleRequestDetail",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProdLine",
table: "Store_AssembleRequest",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
}
}
}

291
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@ -893,10 +893,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("nvarchar(64)")
.HasColumnName("Number");
b.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Remark")
.HasMaxLength(3072)
.HasColumnType("nvarchar(3072)")
@ -934,6 +930,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<decimal>("BoxQty")
.HasColumnType("decimal(18,6)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
@ -942,12 +941,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<DateTime>("ExpiredTime")
.HasColumnType("datetime2");
b.Property<string>("FromLocationArea")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("IssuedQty")
.HasPrecision(18, 6)
.HasColumnType("decimal(18,6)");
@ -1060,10 +1053,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("nvarchar(64)")
.HasColumnName("Uom");
b.Property<string>("WorkStation")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.HasKey("Id");
b.HasIndex("ItemCode");
@ -1410,6 +1399,82 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_BackFlushNoteDetail", (string)null);
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.Chassis", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("ChassisNumber")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("Description")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<string>("Number")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<DateTime>("ProduceDateTime")
.HasColumnType("datetime2");
b.Property<DateTime>("ReceiveInterfaceDateTime")
.HasColumnType("datetime2");
b.Property<string>("Remark")
.HasMaxLength(3072)
.HasColumnType("nvarchar(3072)")
.HasColumnName("Remark");
b.Property<long>("SortNumber")
.HasColumnType("bigint");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("ChassisNumber")
.IsUnique();
b.HasIndex("Number")
.IsUnique();
b.HasIndex("SortNumber")
.IsUnique();
b.ToTable("Store_Chassis", (string)null);
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CheckJob", b =>
{
b.Property<Guid>("Id")
@ -3406,6 +3471,168 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Job_CountJob", (string)null);
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CountJobDependentDetail", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("ArriveDate")
.HasColumnType("datetime2");
b.Property<string>("ContainerCode")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("ContainerCode");
b.Property<string>("CountDescription")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("CountLabel")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("CountOperator")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<decimal>("CountQty")
.HasColumnType("decimal(18,6)");
b.Property<DateTime?>("CountTime")
.HasColumnType("datetime2");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<DateTime>("ExpireDate")
.HasColumnType("datetime2");
b.Property<string>("InventoryLocationCode")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<decimal>("InventoryQty")
.HasColumnType("decimal(18,6)");
b.Property<string>("ItemCode")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("ItemCode");
b.Property<string>("ItemDesc1")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("ItemDesc1");
b.Property<string>("ItemDesc2")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("ItemDesc2");
b.Property<string>("ItemName")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("ItemName");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<string>("LocationArea")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("LocationArea");
b.Property<string>("LocationCode")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("LocationCode");
b.Property<string>("LocationErpCode")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("LocationErpCode");
b.Property<string>("LocationGroup")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("LocationGroup");
b.Property<string>("Lot")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("Lot");
b.Property<Guid>("MasterID")
.HasColumnType("uniqueidentifier");
b.Property<string>("Number")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("PackingCode")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("PackingCode");
b.Property<DateTime>("ProduceDate")
.HasColumnType("datetime2");
b.Property<string>("Remark")
.HasMaxLength(3072)
.HasColumnType("nvarchar(3072)")
.HasColumnName("Remark");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<decimal>("StdPackQty")
.HasColumnType("decimal(18,6)");
b.Property<string>("SupplierBatch")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("SupplierBatch");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.Property<string>("Uom")
.HasColumnType("nvarchar(max)");
b.Property<string>("WarehouseCode")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("WarehouseCode");
b.HasKey("Id");
b.HasIndex("MasterID");
b.ToTable("Job_CountJobDependentDetail", (string)null);
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CountJobDetail", b =>
{
b.Property<Guid>("Id")
@ -28587,14 +28814,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("nvarchar(64)")
.HasColumnName("Number");
b.Property<string>("PreparationPlanNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Remark")
.HasMaxLength(3072)
.HasColumnType("nvarchar(3072)")
@ -28619,10 +28838,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<string>("Worker")
.HasColumnType("nvarchar(max)");
b.Property<string>("Workshop")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.HasKey("Id");
b.HasIndex("Number")
@ -28637,6 +28852,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<decimal>("BoxQty")
.HasColumnType("decimal(18,6)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
@ -28645,12 +28863,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<DateTime>("ExpiredTime")
.HasColumnType("datetime2");
b.Property<string>("FromLocationArea")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("IssuedQty")
.HasPrecision(18, 6)
.HasColumnType("decimal(18,6)");
@ -28762,10 +28974,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("nvarchar(64)")
.HasColumnName("Uom");
b.Property<string>("WorkStation")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.HasKey("Id");
b.HasIndex("ItemCode");
@ -28877,6 +29085,15 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired();
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CountJobDependentDetail", b =>
{
b.HasOne("Win_in.Sfs.Wms.Store.Domain.CountJob", null)
.WithMany("DepDetails")
.HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CountJobDetail", b =>
{
b.HasOne("Win_in.Sfs.Wms.Store.Domain.CountJob", null)
@ -29708,6 +29925,8 @@ namespace Win_in.Sfs.Wms.Store.Migrations
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.CountJob", b =>
{
b.Navigation("DepDetails");
b.Navigation("Details");
});

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs

@ -127,6 +127,11 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
public DbSet<ExchangeData> ExchangeDatas { get; set; }
public DbSet<EquipmentRecord> EquipmentRecords { get; set; }
/// <summary>
/// 底盘信息
/// </summary>
public DbSet<Domain.Chassis> Chassis { get; set; }
public StoreDbContext(DbContextOptions<StoreDbContext> options)
: base(options)
{

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs

@ -134,6 +134,8 @@ public static class StoreDbContextModelCreatingExtensions
builder.ConfigureTransferLibJob(options);
#endregion
builder.ConfigureChassis(options);
builder.ConfigureExchangeData(options);
//设置decimal的默认小数位数

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@ -157,6 +157,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
context.Services.AddTransient<IExchangeDataRepository, ExchangeDataEfCoreRepository>();
context.Services.AddTransient<IChassisRepository, ChassisEfCoreRepository>();
}
private void ConfigureEntity()

Loading…
Cancel
Save