Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
303b32f43c
  1. 21
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/EntityFrameworkCore/SettleAccountHttpApiHostMigrationsDbContext.cs
  2. 29
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/EntityFrameworkCore/SettleAccountHttpApiHostMigrationsDbContextFactory.cs
  3. 2
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
  4. 58
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
  5. 7
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  6. 6
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
  8. 7
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
  9. 8
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309043455_1.Designer.cs
  10. 6093
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309043455_1.cs
  11. 14698
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.Designer.cs
  12. 62
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.cs
  13. 14696
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
  14. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
  15. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs

21
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/EntityFrameworkCore/SettleAccountHttpApiHostMigrationsDbContext.cs

@ -1,21 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
namespace Win.Sfs.SettleAccount
{
public class SettleAccountHttpApiHostMigrationsDbContext : AbpDbContext<SettleAccountHttpApiHostMigrationsDbContext>
{
public SettleAccountHttpApiHostMigrationsDbContext(DbContextOptions<SettleAccountHttpApiHostMigrationsDbContext> options)
: base(options)
{
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.ConfigureSettleAccount();
}
}
}

29
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/EntityFrameworkCore/SettleAccountHttpApiHostMigrationsDbContextFactory.cs

@ -1,29 +0,0 @@
using System.IO;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
using Microsoft.Extensions.Configuration;
namespace Win.Sfs.SettleAccount
{
public class SettleAccountHttpApiHostMigrationsDbContextFactory : IDesignTimeDbContextFactory<SettleAccountHttpApiHostMigrationsDbContext>
{
public SettleAccountHttpApiHostMigrationsDbContext CreateDbContext(string[] args)
{
var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<SettleAccountHttpApiHostMigrationsDbContext>()
.UseSqlServer(configuration.GetConnectionString("SettleAccountService"));
return new SettleAccountHttpApiHostMigrationsDbContext(builder.Options);
}
private static IConfigurationRoot BuildConfiguration()
{
var builder = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: false);
return builder.Build();
}
}
}

2
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@ -54,6 +54,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="EntityFrameworkCore\" />
<Folder Include="Migrations\" />
<Folder Include="wwwroot\files\host\my-file-container\" /> <Folder Include="wwwroot\files\host\my-file-container\" />
</ItemGroup> </ItemGroup>

58
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs

@ -59,9 +59,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
} }
[HttpPost] [HttpGet]
[Route("Make")] [Route("Make")]
public async Task<string> ReportMake(string version) public async Task<string> ReportMake(string version,DateTime accountDate)
{ {
var _ls= _dapper.GetWmsSumExtendList(version);//报表 var _ls= _dapper.GetWmsSumExtendList(version);//报表
@ -102,7 +102,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
itm., itm.,
String.Empty, String.Empty,
0, 0,
version version,
accountDate
)); ));
} }
@ -142,50 +144,38 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// <summary>
/// Wms汇总合计明细
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
//[HttpPost]
//[Route("Output")]
//virtual public async Task<bool> OutputAsync(WmsRequestDetailReportDto input)
//{
// var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting,int.MaxValue,
// 0, true);
// List<WmsDetailReport> _ls = new List<WmsDetailReport>();
// if(shentities.Count())
// _erpDapper.InsertWmsSum(_ls,input.ver);
// //for (int i = 0; i < _count; i++)
// //{
// //}
[HttpPost]
[Route("Output")]
virtual public async Task<bool> OutputAsync(WmsRequestDetailReportDto input)
{
var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
0, true);
List<WmsDetailReport> _ls = new List<WmsDetailReport>();
if (entities.Count() > 0)
{
var _entity = entities.FirstOrDefault();
if (_entity != null)
{
var _version = _entity.Version;
var _accountDate = _entity.AccountDate;
_erpDapper.InsertWmsSum(_ls, _version, _accountDate);
}
}
return true;
//}
/// <summary> }
/// 导出
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]

7
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -3631,13 +3631,6 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSOutputSumReportAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput.WmsRequestDetailReportDto)">
<summary>
导出
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:Win.Sfs.SettleAccount.FISes.FISAppService"> <member name="T:Win.Sfs.SettleAccount.FISes.FISAppService">
<summary> <summary>
区域相关应用服务 区域相关应用服务

6
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs

@ -14,7 +14,7 @@ namespace Win.Sfs.SettleAccount.Entities
{ {
} }
public WmsDetailReport(Guid id, int lineNumber, string client, string type, string settleCode, string saleCode, string clientCode, string billNum, string materialCode, string saleType, decimal qty, decimal outputQty, decimal diffQty, decimal price, decimal amt, decimal outPutAmt, decimal diffAmt, string materialGroupCode, string materialGroup, string materialDesc, string remark1, int state, string version) : base(id) public WmsDetailReport(Guid id, int lineNumber, string client, string type, string settleCode, string saleCode, string clientCode, string billNum, string materialCode, string saleType, decimal qty, decimal outputQty, decimal diffQty, decimal price, decimal amt, decimal outPutAmt, decimal diffAmt, string materialGroupCode, string materialGroup, string materialDesc, string remark1, int state, string version,DateTime accountdate) : base(id)
{ {
LineNumber = lineNumber; LineNumber = lineNumber;
Client = client; Client = client;
@ -38,6 +38,7 @@ namespace Win.Sfs.SettleAccount.Entities
Remark1 = remark1; Remark1 = remark1;
State = state; State = state;
Version = version; Version = version;
AccountDate = accountdate;
} }
[Display(Name = "行号")] [Display(Name = "行号")]
@ -87,5 +88,8 @@ namespace Win.Sfs.SettleAccount.Entities
public string Remark1 { set; get; } public string Remark1 { set; get; }
public int State { set; get; } public int State { set; get; }
public DateTime AccountDate { set; get; }
} }
} }

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@ -377,7 +377,7 @@ namespace Win.Sfs.SettleAccount
builder.ConfigureWmsOneTimeSaleOutPutVersion(options); builder.ConfigureWmsOneTimeSaleOutPutVersion(options);
builder.ConfigureWmsOneTimeSaleOutPutDetial(options); builder.ConfigureWmsOneTimeSaleOutPutDetial(options);
builder.ConfigureWmsDetailReport(options);
#endregion #endregion

7
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs

@ -21,14 +21,7 @@ namespace Win.Sfs.SettleAccount
[ConnectionStringName("Wms")] [ConnectionStringName("Wms")]
public class WMSDbContext : AbpDbContext<WMSDbContext> public class WMSDbContext : AbpDbContext<WMSDbContext>
{ {
#region DbSet
public virtual DbSet<WmsJitOutPutDetial> WmsJitOutPutDetial { get; set; }
public virtual DbSet<TEA_TASK_SUB> TEA_TASK_SUB { get; set; }
//public virtual DbSet<WmsKanbanOutPutDetial> WmsKanbanOutPutDetial { get; set; }
public virtual DbSet<WmsSharePartOutPutDetial> WmsSharePartOutPutDetial { get; set; }
#endregion
/* Add DbSet properties for your Aggregate Roots / Entities here. /* Add DbSet properties for your Aggregate Roots / Entities here.
* Also map them inside NewJitDbContextModelCreatingExtensions.ConfigureNewJit * Also map them inside NewJitDbContextModelCreatingExtensions.ConfigureNewJit

8
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/SettleAccountHttpApiHostMigrationsDbContextModelSnapshot.cs → src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309043455_1.Designer.cs

@ -3,16 +3,18 @@ using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Win.Sfs.SettleAccount; using Win.Sfs.SettleAccount;
namespace Win.Sfs.SettleAccount.Migrations namespace Win.Sfs.SettleAccount.Migrations
{ {
[DbContext(typeof(SettleAccountHttpApiHostMigrationsDbContext))] [DbContext(typeof(SettleAccountDbContext))]
partial class SettleAccountHttpApiHostMigrationsDbContextModelSnapshot : ModelSnapshot [Migration("20220309043455_1")]
partial class _1
{ {
protected override void BuildModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder

6093
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309043455_1.cs

File diff suppressed because it is too large

14698
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.Designer.cs

File diff suppressed because it is too large

62
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.cs

@ -0,0 +1,62 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _20220207 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Set_WmsDetailReport",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LineNumber = table.Column<int>(type: "int", nullable: false),
Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
Client = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
Type = table.Column<string>(type: "nvarchar(max)", nullable: true),
SettleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
SaleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
ClientCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
BillNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
OutputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
DiffQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Price = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
OutPutAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
DiffAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
MaterialGroupCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
MaterialGroup = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
MaterialDesc = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
Remark1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
State = table.Column<int>(type: "int", nullable: false),
AccountDate = table.Column<DateTime>(type: "datetime2", 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),
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Enabled = table.Column<bool>(type: "bit", nullable: false),
Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Set_WmsDetailReport", x => x.Id);
});
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Set_WmsDetailReport");
}
}
}

14696
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

File diff suppressed because it is too large

2
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs

@ -184,7 +184,7 @@ namespace SettleAccount.Job.Services
//.Select(p => p.FirstOrDefault()); //.Select(p => p.FirstOrDefault());
_ls = _ls.OrderBy(p => p.SapMaterialCode).ThenBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList(); _ls = _ls.OrderBy(p => p.SapMaterialCode).ThenBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ToList();
} }
_outputService.Export<InvoiceSettledDetailDiff>(id, _filename, _ls); _outputService.Export<InvoiceSettledDetailDiff>(id, _filename, _ls);

2
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs

@ -101,7 +101,7 @@ namespace SettleAccount.Job.Services.Report
_list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
} }
} }
_list = _list.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ThenBy(p => p.Flag).ToList(); _list = _list.OrderBy(p => p.SapMaterialCode).ThenBy(p => p.ChassisNumber).ThenBy(p => p.Flag).ToList();
_outputService.Export<UnSettleDetailReport>(id, _first, _list); _outputService.Export<UnSettleDetailReport>(id, _first, _list);
return id.ToString(); return id.ToString();

Loading…
Cancel
Save