Browse Source

修改EID期间字段类型为String

master
mahao 1 year ago
parent
commit
80a9990655
  1. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs
  2. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs
  3. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_DETAIL_SERVICE.cs
  4. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs
  5. 5134
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230801054818_20230801-1.Designer.cs
  6. 53
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230801054818_20230801-1.cs
  7. 8
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

6
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs

@ -1,4 +1,4 @@
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Core;
using System;
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Application.Dtos;
@ -20,7 +20,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// 期间
/// </summary>
[Display(Name = "期间")]
public int Version { get; set; }
public string Version { get; set; }
/// <summary>
/// 零件号
@ -85,7 +85,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// </summary>
[Display(Name = "期间")]
[ExporterHeader(DisplayName = "期间")]
public int Version { get; set; }
public string Version { get; set; }
/// <summary>
/// 零件号

4
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_DETAIL_Service.cs

@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using SettleAccount.Domain.BQ;
using Shouldly;
@ -47,7 +47,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
public async Task<string> ExportAsync(RequestDto input)
{
string fileName = $"BBAC发运_{Guid.NewGuid()}.xlsx";
string fileName = $"BBAC发运数据_{Guid.NewGuid()}.xlsx";
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
var dtos = ObjectMapper.Map<List<BBAC_SE_DETAIL>, List<BBAC_SE_DETAIL_EXPORT_DTO>>(entities);

4
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_DETAIL_SERVICE.cs

@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using SettleAccount.Domain.BQ;
using Shouldly;
@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
public async Task<string> ExportAsync(RequestDto input)
{
string fileName = $"HBPO发运_{Guid.NewGuid()}.xlsx";
string fileName = $"HBPO发运数据_{Guid.NewGuid()}.xlsx";
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
var dtos = ObjectMapper.Map<List<HBPO_SE_DETAIL>, List<HBPO_SE_DETAIL_EXPORT_DTO>>(entities);

6
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs

@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Domain.Entities.Auditing;
@ -10,7 +10,7 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot<Guid>
public string KeyCode { get; set; } = null!;
[Display(Name = "期间")]
public int Version { get; set; }
public string Version { get; set; }
[Display(Name = "零件号")]
public string LU { get; set; } = null!;
@ -47,7 +47,7 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot<Guid>
public BBAC_SE_EDI()
{ }
public BBAC_SE_EDI(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate
public BBAC_SE_EDI(Guid guid, string keyCode, string version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate
,string site, string extend1, string extend2, string extend3, string extend4)
{

5134
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230801054818_20230801-1.Designer.cs

File diff suppressed because it is too large

53
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230801054818_20230801-1.cs

@ -0,0 +1,53 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _202308011 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Version",
table: "Set_BBAC_SE_EDI",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<bool>(
name: "IsReturn",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "bit",
maxLength: 50,
nullable: false,
defaultValue: false,
oldClrType: typeof(string),
oldType: "nvarchar(50)",
oldMaxLength: 50,
oldNullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "Version",
table: "Set_BBAC_SE_EDI",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "IsReturn",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "nvarchar(50)",
maxLength: 50,
nullable: true,
oldClrType: typeof(bool),
oldType: "bit",
oldMaxLength: 50);
}
}
}

8
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@ -212,9 +212,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<string>("IsReturn")
b.Property<bool>("IsReturn")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
.HasColumnType("bit");
b.Property<string>("KeyCode")
.HasMaxLength(50)
@ -783,8 +783,8 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("Site")
.HasColumnType("nvarchar(max)");
b.Property<int>("Version")
.HasColumnType("int");
b.Property<string>("Version")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");

Loading…
Cancel
Save