mahao 1 year ago
parent
commit
6a86216230
  1. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs
  2. 25
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
  3. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs
  4. 3992
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230714033202_20230714-2.Designer.cs
  5. 29
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230714033202_20230714-2.cs
  6. 4
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

8
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Controls/CentralizedControlDtoBase.cs

@ -31,7 +31,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
/// <summary>
/// 是否开放状态
/// </summary>
public int State { set; get; }
public bool State { set; get; }
}
@ -70,7 +70,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
/// <summary>
/// 是否开放状态
/// </summary>
public int State { set; get; }
public bool State { set; get; }
public Guid BranchId { get ; set ; }
}
public class CentralizedControlImportDto
@ -93,7 +93,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
/// <summary>
/// 是否开放状态
/// </summary>
public int State { set; get; }
public bool State { set; get; }
}
@ -124,7 +124,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
/// 是否开放状态
/// </summary>
[ExporterHeader(DisplayName = "是否开放状态")]
public int State { set; get; }
public bool State { set; get; }
}

25
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@ -125,16 +125,35 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
});
//可结算
var pubCanSa = new List<string>();
//不可结算
var pubNotCanSa = new List<string>();
var pubCanSa = new PUB_CAN_SA()
{
};
var pubCanSaDetails = new List<PUB_CAN_SA_DETAIL>();
//不可结算
var pubNotSaDetails = new List<PUB_NOT_SA_DETAIL>();
//不可结算 结算分组号码
var pubNotSaGroupNum = _ls.FindAll(t => t.Price != 0).Select(t => t.GroupNum).Distinct();
var pubCanSaDetailsd = _ls.FindAll(t => pubNotSaGroupNum.Contains(t.GroupNum) == false);
var ddd = _ls.FindAll(t => pubNotSaGroupNum.Contains(t.GroupNum) == true);
//await _repository.InsertAsync(pubSa);
//await _pubSaDetailRepository.InsertManyAsync(_ls);
if (pubCanSaDetails.Count > 0)
{
await _pubCanSaRepository.InsertAsync(pubCanSa);
await _pubCanSaDetailRepository.InsertManyAsync(pubCanSaDetails);
}
if (pubNotSaDetails.Count > 0)
{
await _pubNotSaDetailRepository.InsertManyAsync(pubNotSaDetails);
}
return ApplicationConsts.SuccessStr;
}

8
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Controls/CentralizedControl.cs

@ -29,7 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
/// <summary>
/// 是否开放状态
/// </summary>
public int State { set; get; }
public bool State { set; get; }
public void SetValue(Guid id,Guid branchId)
@ -41,11 +41,11 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
public void OpenVersion()
{
State = 0;
State = true;
}
public void ClosedVersion()
{
State = 1;
State = false;
}
@ -60,7 +60,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls
public CentralizedControl(
Guid id,
Guid branchId,
string year, string period, string version, int state):base(id)
string year, string period, string version, bool state):base(id)
{
BranchId = branchId;
Year = year;

3992
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230714033202_20230714-2.Designer.cs

File diff suppressed because it is too large

29
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230714033202_20230714-2.cs

@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _202307142 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<bool>(
name: "State",
table: "Set_control",
type: "bit",
nullable: false,
oldClrType: typeof(int),
oldType: "int");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "State",
table: "Set_control",
type: "int",
nullable: false,
oldClrType: typeof(bool),
oldType: "bit");
}
}
}

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

@ -3449,8 +3449,8 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("Remark")
.HasColumnType("nvarchar(max)");
b.Property<int>("State")
.HasColumnType("int");
b.Property<bool>("State")
.HasColumnType("bit");
b.Property<string>("Version")
.HasColumnType("nvarchar(max)");

Loading…
Cancel
Save