PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG 

# Conflicts:
#	.gitignore
#	src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211207.txt
#	vue/static/config.js
branch_ccpg_220107
44673626 3 years ago
parent
7682bd1f0b 623f1f2a20
commit
bd01fe1f47
34 changed files with 14209 additions and 3270 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. 2
      src/Modules/BaseService/BaseService.Host/appsettings.json
  2. 5
      src/Modules/SettleAccount/NuGet.Config
  3. 1081
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211204.txt
  4. 11251
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211206.txt
  5. 1255
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211110061756_initail.Designer.cs
  6. 507
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211110061756_initail.cs
  7. 1255
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211112093946_data20211112.Designer.cs
  8. 31
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211112093946_data20211112.cs
  9. 2
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs
  10. 4
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json
  11. 4
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
  12. 119
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  13. 26
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  14. 5
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettle/UnSettleDetailReport.cs
  15. 21
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
  16. 3
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleDoorPanelDapperRepository.cs
  17. 37
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs
  18. 16
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
  19. 14
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleDoorPanelExportService.cs
  20. 6
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
  21. 11
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs
  22. BIN
      src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
  23. BIN
      src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
  24. BIN
      src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
  25. BIN
      src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
  26. BIN
      src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
  27. BIN
      src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
  28. 2
      vue/src/router/modules/fis.js
  29. 29
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  30. 34
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  31. 18
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  32. 1563
      vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
  33. 158
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  34. 20
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

2
src/Modules/BaseService/BaseService.Host/appsettings.json
View File

@ -7,7 +7,7 @@
"CorsOrigins": "http://localhost:9527,http://localhost:9528"
},
"ConnectionStrings": {
"Default": "Server=192.168.0.213;Database=ABP;User ID=sa;Password=Microsoft@2021;"
"Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008"
// "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;User ID=sa;Password=1q2w!@#;"
//"Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;"
},

5
src/Modules/SettleAccount/NuGet.Config
View File

@ -1,6 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="BlazoriseMyGet" value="https://www.myget.org/F/blazorise/api/v3/index.json" />
</packageSources>
</configuration>

1081
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211204.txt
View File

File diff suppressed because it is too large

11251
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211206.txt
View File

File diff suppressed because it is too large

1255
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211110061756_initail.Designer.cs
View File

File diff suppressed because it is too large

507
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211110061756_initail.cs
View File

@ -1,507 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class initail : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Set_Invoice",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
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(1000)", maxLength: 1000, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Set_Invoice", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_InvoiceVersion",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
CustomerCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
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_InvoiceVersion", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_KanBanSettle",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(max)", nullable: true),
Period = table.Column<string>(type: "nvarchar(max)", nullable: true),
Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
Kanban = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
Relation = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
MaterialCode = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
PartType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
SupplierCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
SettleInputDate = table.Column<DateTime>(type: "datetime2", nullable: false),
Batch = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Flag = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
SettleDate = table.Column<DateTime>(type: "datetime2", nullable: false),
State = table.Column<int>(type: "int", nullable: false),
Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
ParentId = table.Column<Guid>(type: "uniqueidentifier", 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_KanBanSettle", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_KanBanSettle_Version",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
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_KanBanSettle_Version", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_ScrapClaims",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
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(1000)", maxLength: 1000, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Set_ScrapClaims", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_ScrapClaims_Version",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
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_ScrapClaims_Version", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_Settle",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
SettleYear = table.Column<string>(type: "nvarchar(max)", nullable: true),
KENNCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
ChassisNumber = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Model = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CP5A = table.Column<DateTime>(type: "datetime2", nullable: false),
CP7 = table.Column<DateTime>(type: "datetime2", nullable: false),
MaterialCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
SettlementID = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
SettlementSupplier = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
state = table.Column<int>(type: "int", nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, 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_Settle", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_Settle_Version",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Factory = table.Column<string>(type: "nvarchar(max)", nullable: true),
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_Settle_Version", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_SparePart",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
LineNumber = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
PurchaseType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
PurchaseOrderNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
PurchaseOrderNoItem = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
PurchaseOrderNoText = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
ReceiptQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
InvoicedQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
AmountNoTax = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
PurchasePriceNoTax = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
AccountNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
MaterialCode = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
SpareDate = table.Column<DateTime>(type: "datetime2", nullable: false),
DeliveryOrderNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
DeliveryLineNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
BatchNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Unit = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
TaxRate = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
TaxCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
GermanInvoiceNo = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
FactoryName = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
Extend = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: true),
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_SparePart", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_SparePart_Version",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
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_SparePart_Version", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_Unsettle",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
SettleYear = table.Column<string>(type: "nvarchar(max)", nullable: true),
KENNCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
ChassisNumber = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Model = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CP5A = table.Column<DateTime>(type: "datetime2", nullable: false),
CP7 = table.Column<DateTime>(type: "datetime2", nullable: false),
MaterialCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
SettlementID = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
SettlementSupplier = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
state = table.Column<int>(type: "int", nullable: false),
UnsettledReason = table.Column<string>(type: "nvarchar(max)", nullable: true),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, 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_Unsettle", x => x.Id);
});
migrationBuilder.CreateTable(
name: "Set_Unsettle_Version",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
Factory = table.Column<string>(type: "nvarchar(max)", nullable: true),
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_Unsettle_Version", x => x.Id);
});
migrationBuilder.CreateIndex(
name: "IX_Set_KanBanSettle_Kanban_MaterialCode",
table: "Set_KanBanSettle",
columns: new[] { "Kanban", "MaterialCode" },
unique: true,
filter: "IsDeleted=0");
migrationBuilder.CreateIndex(
name: "IX_Set_KanBanSettle_Version_Version",
table: "Set_KanBanSettle_Version",
column: "Version",
unique: true,
filter: "IsDeleted=0");
migrationBuilder.CreateIndex(
name: "IX_Set_ScrapClaims_Version_Version",
table: "Set_ScrapClaims_Version",
column: "Version",
unique: true,
filter: "IsDeleted=0");
migrationBuilder.CreateIndex(
name: "IX_Set_Settle_state",
table: "Set_Settle",
column: "state");
migrationBuilder.CreateIndex(
name: "IX_Set_Settle_Version_ChassisNumber_MaterialCode_KENNCode",
table: "Set_Settle",
columns: new[] { "Version", "ChassisNumber", "MaterialCode", "KENNCode" });
migrationBuilder.CreateIndex(
name: "IX_Set_Settle_Version_Version",
table: "Set_Settle_Version",
column: "Version",
unique: true,
filter: "IsDeleted=0");
migrationBuilder.CreateIndex(
name: "IX_Set_SparePart_Version_Version",
table: "Set_SparePart_Version",
column: "Version",
unique: true,
filter: "IsDeleted=0");
migrationBuilder.CreateIndex(
name: "IX_Set_Unsettle_state",
table: "Set_Unsettle",
column: "state");
migrationBuilder.CreateIndex(
name: "IX_Set_Unsettle_Version_ChassisNumber_MaterialCode",
table: "Set_Unsettle",
columns: new[] { "Version", "ChassisNumber", "MaterialCode" },
unique: true);
migrationBuilder.CreateIndex(
name: "IX_Set_Unsettle_Version_Version",
table: "Set_Unsettle_Version",
column: "Version",
unique: true,
filter: "IsDeleted=0");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Set_Invoice");
migrationBuilder.DropTable(
name: "Set_InvoiceVersion");
migrationBuilder.DropTable(
name: "Set_KanBanSettle");
migrationBuilder.DropTable(
name: "Set_KanBanSettle_Version");
migrationBuilder.DropTable(
name: "Set_ScrapClaims");
migrationBuilder.DropTable(
name: "Set_ScrapClaims_Version");
migrationBuilder.DropTable(
name: "Set_Settle");
migrationBuilder.DropTable(
name: "Set_Settle_Version");
migrationBuilder.DropTable(
name: "Set_SparePart");
migrationBuilder.DropTable(
name: "Set_SparePart_Version");
migrationBuilder.DropTable(
name: "Set_Unsettle");
migrationBuilder.DropTable(
name: "Set_Unsettle_Version");
}
}
}

1255
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211112093946_data20211112.Designer.cs
View File

File diff suppressed because it is too large

31
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211112093946_data20211112.cs
View File

@ -1,31 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class data20211112 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "State",
table: "Set_KanBanSettle",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "State",
table: "Set_KanBanSettle",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
}
}
}

2
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccountHttpApiHostModule.cs
View File

@ -449,7 +449,7 @@ namespace Win.Sfs.SettleAccount
options.DocExpansion(DocExpansion.None); //->修改界面打开时自动折叠
});
new BackgroundJobServerOptions() { WorkerCount = 1, ServerTimeout=TimeSpan.FromSeconds(1200) };
new BackgroundJobServerOptions() { WorkerCount = 4, ServerTimeout=TimeSpan.FromSeconds(1200) };
app.UseHangfireServer();
app.UseHangfireDashboard();
app.UseAuditing();

4
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json
View File

@ -7,8 +7,8 @@
// "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
//},
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008",
"SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;"
"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;Password=1;"
},
"Logging": {
"LogLevel": {

4
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
View File

@ -7,8 +7,8 @@
// "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
//},
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008",
"SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;"
"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;Password=127.0.0.1;"
},
"Logging": {
"LogLevel": {

119
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
View File

@ -96,22 +96,22 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber
string chassisNumber,
string materialGroup
)
{
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(version) ? string.Empty : version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : end });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber });
var _taskid = await _service.ExportEnqueueAsync("大众准时化结算门板价格差异比对报表", ExportExtentsion.Excel, CurrentUser, typeof(SettleDoorPanelExportService), customConditionList, (rs) =>
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup });
var _taskid = await _service.ExportEnqueueAsync("大众准时化结算门板价格差异比对报表", ExportExtentsion.Excel, CurrentUser, typeof(SettleDoorPanelExportService), customConditionList, (rs) =>
{
});
return _taskid;
@ -365,7 +365,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber
string chassisNumber,
string materialGroup
)
{
@ -373,12 +374,15 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value =string.IsNullOrEmpty(version) ?string.Empty:version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ?string.Empty: materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : end });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup });
var _taskid = await _service.ExportEnqueueAsync("大众发票与结算核对明细表", ExportExtentsion.Excel, CurrentUser, typeof(InvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
{
});
@ -386,7 +390,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
}
/// <summary>
/// 2.大众结算未发运核对明细表
///3.大众准时化结算数量差异比对表
/// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns>
@ -429,22 +433,21 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns>
[HttpGet]
[Route("SettleFisDiffExport-Make")]
[DisableRequestSizeLimit]
public async Task<string> SettleFisDiffExportMake( string version, string materialCode, string begin, string end)
{
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode});
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end });
var _taskid = await _service.ExportEnqueueAsync("大众准时化结算数量差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(SettleFisDiffExportService), customConditionList, (rs) =>
{
});
return _taskid;
}
//[HttpGet]
//[Route("SettleFisDiffExport-Make")]
//[DisableRequestSizeLimit]
//public async Task<string> SettleFisDiffExportMake( string version, string materialCode, string begin, string end)
//{
// List<CustomCondition> customConditionList = new List<CustomCondition>();
// customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
// customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode});
// customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin });
// customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end });
// var _taskid = await _service.ExportEnqueueAsync("大众准时化结算数量差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(SettleFisDiffExportService), customConditionList, (rs) =>
// {
// });
// return _taskid;
//}
/// <summary>
/// 7.大众准时化未结明细表（包含漏结，漏结要有标识）
@ -466,7 +469,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = !string.IsNullOrEmpty(materialCode)?materialCode:string.Empty });
customConditionList.Add(new CustomCondition() { Name = "Begin", Value = !string.IsNullOrEmpty(begin)?string.Empty: begin });
customConditionList.Add(new CustomCondition() { Name = "End", Value = !string.IsNullOrEmpty(end)?string.Empty: end });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = !string.IsNullOrEmpty(end) ? string.Empty : end });
//var _first = exportName.FirstOrDefault();
@ -570,37 +573,37 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
}
/// <summary>
/// 结算总成和ERP总成价格对比
/// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns>
[HttpGet]
[Route("SecMatchBaseMake-Make")]
[DisableRequestSizeLimit]
public async Task<string> SecMatchBaseMake(string version)
{
if (!_relationshipRepository.Any(p => p.Version == version ))
{
throw new BusinessException("8989", string.Format("不存总成与结算件零件关系{0}期间", version));
}
//if (!_settlementPartVersionrepository.Any(p => p.Version == version && p.CustomerCode == customerCode))
//{
// throw new BusinessException("8989", string.Format("不存结算包价格{0}期间", version));
//}
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "二配当月结算表" });
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
//customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode });
var _taskid = await _service.ExportEnqueueAsync("二配当月结算表", ExportExtentsion.Excel, CurrentUser, typeof(SecMatchBaseExportService), customConditionList, (rs) =>
{
});
return _taskid;
}
///// <summary>
///// 结算总成和ERP总成价格对比
///// </summary>
///// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
///// <returns></returns>
//[HttpGet]
//[Route("SecMatchBaseMake-Make")]
//[DisableRequestSizeLimit]
//public async Task<string> SecMatchBaseMake(string version)
//{
// if (!_relationshipRepository.Any(p => p.Version == version ))
// {
// throw new BusinessException("8989", string.Format("不存总成与结算件零件关系{0}期间", version));
// }
// //if (!_settlementPartVersionrepository.Any(p => p.Version == version && p.CustomerCode == customerCode))
// //{
// // throw new BusinessException("8989", string.Format("不存结算包价格{0}期间", version));
// //}
// List<CustomCondition> customConditionList = new List<CustomCondition>();
// customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "二配当月结算表" });
// customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
// //customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode });
// var _taskid = await _service.ExportEnqueueAsync("二配当月结算表", ExportExtentsion.Excel, CurrentUser, typeof(SecMatchBaseExportService), customConditionList, (rs) =>
// {
// });
// return _taskid;
//}

26
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
View File

@ -2646,7 +2646,7 @@
<param name="repository">仓储接口</param>
<param name="cache">缓存</param>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleDoorPanel(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleDoorPanel(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
大众准时化结算门板价格差异比对报表
</summary>
@ -2735,7 +2735,7 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
2.大众发票与结算核对明细表
</summary>
@ -2743,18 +2743,11 @@
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnInvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
2.大众结算未发运核对明细表
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleFisDiffExportMake(System.String,System.String,System.String,System.String)">
<summary>
<summary>
3.大众准时化结算数量差异比对表
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnsettledDetailReportServiceMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
@ -2777,13 +2770,6 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SecMatchBaseMake(System.String)">
<summary>
结算总成和ERP总成价格对比
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.SettleAccountApplicationAutoMapperProfile.CreateMapHQ_H_Platform">
<summary>
红旗H平台导入

5
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettle/UnSettleDetailReport.cs
View File

@ -51,7 +51,10 @@ namespace Win.Sfs.SettleAccount.Entities.UnSettle
[ExporterHeader(DisplayName = "结算平台未结数量 ")]
public decimal Qty { set; get; }
[ExporterHeader(DisplayName = "大众R3未结数量")]
public decimal UnSettleQty { set; get; }
[ExporterHeader(DisplayName = "漏结标识 ")]
public string Flag { set; get; }
[ExporterHeader(DisplayName = "漏结期间 ")]

21
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
View File

@ -96,7 +96,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
: base(dbContextProvider)
{
}
public virtual List<InvoiceSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end ,string cp7begin,string cp7end,string kennCode,string chassisNumber)
public virtual List<InvoiceSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end ,string cp7begin,string cp7end,string kennCode,string chassisNumber,string materialGroup)
{
List<InvoiceSettledDetailDiff> _list = new List<InvoiceSettledDetailDiff>();
@ -106,33 +106,36 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
if (!string.IsNullOrEmpty(materialCode))
{
condition += string.Format(" d.MaterialCode='{0}' ", materialCode);
condition += string.Format(" and d.MaterialCode='{0}' ", materialCode);
}
if (!string.IsNullOrEmpty(begin))
{
condition += string.Format(" a.BeginTime>='{0}' ", begin);
condition += string.Format(" and a.BeginTime>='{0}' ", begin);
}
if (!string.IsNullOrEmpty(end))
{
condition += string.Format(" a.BeginTime<='{0}' ", end);
condition += string.Format(" and a.BeginTime<='{0}' ", end);
}
if (!string.IsNullOrEmpty(cp7begin))
{
condition += string.Format(" B.cp7Time>='{0}' ", cp7begin);
condition += string.Format(" and B.cp7>='{0}' ", cp7begin);
}
if (!string.IsNullOrEmpty(cp7end))
{
condition += string.Format(" B.cp7Time<='{0}' ", cp7end);
condition += string.Format(" and B.cp7<='{0}' ", cp7end);
}
if (!string.IsNullOrEmpty(kennCode))
{
condition += string.Format(" B.kenncode='{0}' ", kennCode);
condition += string.Format(" and B.kenncode='{0}' ", kennCode);
}
if (!string.IsNullOrEmpty(chassisNumber))
{
condition += string.Format(" B.chassisNumber='{0}' ", chassisNumber);
condition += string.Format(" and B.chassisNumber='{0}' ", chassisNumber);
}
//if (!string.IsNullOrEmpty(materialGroup))
//{
// condition += string.Format(" B.chassisNumber='{0}' ", materialGroup);
//}
string str =
"SELECT\n" +
" temp1.*,\n" +

3
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleDoorPanelDapperRepository.cs
View File

@ -97,6 +97,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "单价差异")]
public decimal InvoiceDiffPrice { set; get; }
}
public class SettleDoorPanelSumExport

37
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs
View File

@ -30,9 +30,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
public virtual List<UnSettleDetailReport> GetDiffReport(string year, string begin, string end, string customcode, string version, string materialCode, string materialGroup, string sapCode)
{
string str = string.Empty;
string str = " ";
if (!string.IsNullOrEmpty(begin))
{
str += string.Format(" and beginTime>'{0}' ", begin);
@ -45,23 +43,29 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{
str += string.Format(" and ItemCode='{0}' ", materialCode);
}
if (!string.IsNullOrEmpty(materialGroup))
{
str += string.Format(" and MaterialGroup='{0}' ", materialGroup);
}
//string str2 = " ";
//if (!string.IsNullOrEmpty(sapCode))
//{
// str2 += string.Format(" and b.MaterialCode='{0}' ", sapCode);
//}
//if (!string.IsNullOrEmpty(materialGroup))
//{
// str += string.Format(" and MaterialGroup='{0}' ", materialGroup);
//}
//if (!string.IsNullOrEmpty(sapCode))
//{
// str += string.Format(" and SapCode='{0}' ", materialGroup);
//}
var sqlString =
"SELECT\n" +
" SELECT\n" +
" temp1.*,\n" +
" temp2.Price,\n" +
" ISNULL( temp1.QTY, 0 )* ISNULL( temp2.Price, 0 ) AMT \n" +
"FROM\n" +
" FROM\n" +
" (\n" +
" SELECT\n" +
" A.*,\n" +
" Isnull(F.Qty, 0) UnSettleQty,\n" +
" B.EstimateTypeDesc MaterialGroup,\n" +
" B.MaterialDesc MaterialDesc,\n" +
" d.MaterialDesc ParentMaterialDesc,\n" +
@ -75,14 +79,14 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" BeginTime CP5Time,\n" +
" ItemCode MaterialCode,\n" +
" ChassisNumber,\n" +
" OrderBillNum KENNCode,,\n" +
" OrderBillNum KENNCode,\n" +
" QTY,\n" +
" ErpMaterialCode ParentSapMaterialCode,\n" +
" '' FLAG \n" +
" FROM\n" +
" Set_fis {0}\n" +
" WHERE\n" +
" 1 = 1 \n" +
" Set_fis where 1=1 {0}\n" +
//" WHERE\n" +
//" 1 = 1 \n" +
" AND STATE = 0 UNION ALL\n" +
" SELECT\n" +
" WMSState,\n" +
@ -96,12 +100,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" ErpMaterialCode ParentSapMaterialCode,\n" +
" 'L' FLAG \n" +
" FROM\n" +
" Set_fis {0}\n" +
" Set_fis \n" +
" WHERE\n" +
" 1 = 1 \n" +
" AND STATE = 4 \n" +
" AND STATE = 4 {0}\n" +
" ) A\n" +
" LEFT JOIN Set_material B ON a.MaterialCode = b.CustomerPartCode\n" +
" left join Set_Unsettle f on a.MaterialCode=f.MaterialCode and a.KENNCode=f.KENNCode and a.ChassisNumber=f.ChassisNumber \n"+
" LEFT JOIN Set_material B ON a.MaterialCode = b.CustomerPartCode \n" +
" LEFT JOIN Set_material d ON a.ParentSapMaterialCode = d.MaterialCode \n" +
" ) temp1\n" +
" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) ) temp2 ON temp1.SapMaterialCode = temp2.MaterialCode";

16
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
View File

@ -51,7 +51,11 @@ namespace SettleAccount.Job.Services
var cp7end = p_list.Where(p => p.Name == "Cp7EndTime").FirstOrDefault().Value;
var kenncode = p_list.Where(p => p.Name == "KennCode").FirstOrDefault().Value;
var chassisNumber = p_list.Where(p => p.Name == "ChassisNumber").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, cp7begin, cp7end, kenncode, chassisNumber);
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, cp7begin, cp7end, kenncode, chassisNumber,materialGroup);
var _list = _ls.Where(p=>p.ParentSapMaterialCode!=p.SapMaterialCode).GroupBy(p =>new { p.ParentSapMaterialCode,p.ChassisNumber,p.KENNCode }).Select(p => p.FirstOrDefault()).ToList();
var rangeList = _erpdapperRepository.GetSapList<InvoiceSettledDetailDiff>(_list,version,false);
@ -76,10 +80,6 @@ namespace SettleAccount.Job.Services
});
foreach (var itm in diffList)
{
var _first= _ls.FirstOrDefault(p => p.MaterialCode == itm.MaterialCode);
@ -94,7 +94,11 @@ namespace SettleAccount.Job.Services
}
_ls.AddRange(rangeList);
_ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();
if (!string.IsNullOrEmpty(materialGroup))
{
_ls= _ls.Where(p => p.MaterialGroup == materialGroup).ToList();
}
_ls =_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();
_outputService.Export<InvoiceSettledDetailDiff>(id, string.Format("大众发票与结算核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _ls);
return id.ToString();

14
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleDoorPanelExportService.cs
View File

@ -51,7 +51,8 @@ namespace SettleAccount.Job.Services.Report
var cp7end = p_list.Where(p => p.Name == "Cp7EndTime").FirstOrDefault().Value;
var kenncode = p_list.Where(p => p.Name == "KennCode").FirstOrDefault().Value;
var chassisNumber = p_list.Where(p => p.Name == "ChassisNumber").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, cp7begin, cp7end, kenncode, chassisNumber);
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, cp7begin, cp7end, kenncode, chassisNumber, materialGroup);
var _list = _ls.Where(p => p.ParentSapMaterialCode != p.SapMaterialCode).GroupBy(p => new { p.ParentSapMaterialCode, p.ChassisNumber, p.KENNCode }).Select(p => p.FirstOrDefault()).ToList();
var rangeList = _erpdapperRepository.GetSapList<InvoiceSettledDetailDiff>(_list, version,true);
@ -89,13 +90,16 @@ namespace SettleAccount.Job.Services.Report
}
_ls.AddRange(rangeList);
_ls = _ls.Where(p=>p.DiffPrice!=0).OrderBy(p => p.SapMaterialCode).ToList();
_ls = _ls.Where(p=>p.DiffPrice!=0 ).OrderBy(p => p.SapMaterialCode).ToList();
var report1List = _ls.GroupBy(p => new { p.MaterialGroup, p.MaterialCode, p.MaterialDesc, p.Price, p.InvoicePrice, p.DiffPrice, p.SapMaterialCode })
.Select(t => new SettleDoorPanelExport{ MaterialGroup = t.FirstOrDefault().MaterialGroup, MaterialCode = t.FirstOrDefault().MaterialCode, MaterialDesc = t.FirstOrDefault().MaterialDesc, Price = t.FirstOrDefault().Price, InvoicePrice = t.FirstOrDefault().InvoicePrice, InvoiceDiffPrice = t.FirstOrDefault().DiffPrice, SAPCode = t.FirstOrDefault().SapMaterialCode });
var report1List = _ls.Where(p=>p.DiffPrice!=0).GroupBy(p => new { p.MaterialGroup, p.MaterialCode, p.MaterialDesc, p.Price, p.InvoicePrice, p.DiffPrice, p.SapMaterialCode })
.Select(t => new SettleDoorPanelExport{ MaterialGroup = t.FirstOrDefault().MaterialGroup, MaterialCode = t.FirstOrDefault().MaterialCode, MaterialDesc = t.FirstOrDefault().MaterialDesc, Price = t.FirstOrDefault().Price, InvoicePrice = t.FirstOrDefault().InvoicePrice, InvoiceDiffPrice = t.FirstOrDefault().DiffPrice, SAPCode = t.FirstOrDefault().SapMaterialCode, }).ToList();
var report2List = _ls.GroupBy(p => new {p.MaterialGroup }).Select(p=>new SettleDoorPanelSumExport { MaterialGroup= p.Key.MaterialGroup, InvoiceDiffPrice=p.Sum(itm=>itm.DiffPrice)*p.Sum(itm=>itm.Qty), Version="" });
var report2List = report1List.GroupBy(p => new {p.MaterialGroup }).Select(p=>new SettleDoorPanelSumExport { MaterialGroup= p.Key.MaterialGroup, InvoiceDiffPrice=p.Sum(itm=>itm.InvoiceDiffPrice), Version= version });
ExcelExporter _exporter = new ExcelExporter();//导出Excel
var result = _exporter.Append(report1List.ToList(), "按物料价格差异明细表")
.SeparateBySheet()

6
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
View File

@ -88,7 +88,7 @@ namespace SettleAccount.Job.Services
}
_ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();
var _lsSum=_ls.GroupBy(p => new { p.MaterialCode, p.SapMaterialCode, p.MaterialGroup }).Select(p => new UnInvoiceSettledDetailSum
var _lsSum=_ls.GroupBy(p => new { p.MaterialCode, p.SapMaterialCode, p.MaterialGroup,p.InvoicePrice }).Select(p => new UnInvoiceSettledDetailSum
{
MaterialCode = p.Key.MaterialCode,
SapMaterailCode = p.Key.SapMaterialCode,
@ -96,8 +96,8 @@ namespace SettleAccount.Job.Services
SettleQty = p.Sum(itm => itm.SettledQty),
FisQty=0,
DiffQty=- p.Sum(itm => itm.SettledQty),
Price=p.Sum(itm=>itm.InvoicePrice),
DiffAmt= p.Sum(itm => itm.SettledQty)* p.Sum(itm => itm.InvoicePrice)
Price=p.Key.InvoicePrice,
DiffAmt= p.Sum(itm => itm.SettledQty)* p.Key.InvoicePrice
}).ToList();
var _sumTotal= new UnInvoiceSettledDetailSum() {

11
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs
View File

@ -54,8 +54,17 @@ namespace SettleAccount.Job.Services.Report
);
_list.AddRange(_lst);
_list= _list.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ThenBy(p => p.Flag).ToList();
if (!string.IsNullOrEmpty(sapcode))
{
_list= _list.Where(p => p.SapMaterialCode == sapcode).ToList();
}
if (!string.IsNullOrEmpty(materialGroup))
{
_list= _list.Where(p => p.MaterialGroup == materialGroup).ToList();
}
_list = _list.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ThenBy(p => p.Flag).ToList();
_outputService.Export<UnSettleDetailReport>(id, _first, _list);
return id.ToString();

BIN
src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
View File

Binary file not shown.

BIN
src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
View File

Binary file not shown.

BIN
src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
View File

Binary file not shown.

BIN
src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
vue/src/router/modules/fis.js
View File

@ -79,7 +79,7 @@ const pgfis = {
{
path: '/pg-R100Online',
component: () => import('@/views/pg-fis/basedate/r100Online'),
name: 'pg-M100Online',//命名路由
name: 'pg-R100Online',//命名路由
meta: {
title: 'R100上线信息',
roles: ['SettleAccount.Reports'],

29
vue/src/views/pg-fis/basedate/m100BIll/index.vue
View File

@ -39,7 +39,7 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.id"/>
:value="item.productLineCode"/>
</el-select>
</el-form-item>
@ -568,6 +568,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import moment from "moment";
import { mapGetters } from 'vuex';
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -741,8 +742,9 @@ export default {
},
created() {
//this.getKNRList();
this.getList();
this.getProductLine();
//this.getList();
//console.log(this.userInfo);
},
computed: {
getDefaultField() {
@ -753,7 +755,7 @@ export default {
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 120,
width: 130,
});
// tempsTabs.push({
// label: "底盘号",
@ -790,8 +792,14 @@ export default {
prop: "fileName",
width: 120,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
return tempsTabs;
},
...mapGetters(['userInfo'])//获取当前用户信息
},
methods: {
//抽屉
@ -812,9 +820,10 @@ export default {
//获取当前时间并打印
var _this = this;
let yy = new Date().getFullYear();
let mm = new Date().getMonth()+1;
let dd = new Date().getDate();
let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();;
let month = new Date().getMonth()+1;
let mm = month<10 ? '0'+month : month;
let dd = new Date().getDate()<10 ? '0'+new Date().getDate() : new Date().getDate();
let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();
let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
_this.gettime = yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
@ -1114,7 +1123,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//版本下拉选择
@ -1308,7 +1317,7 @@ export default {
this.$forceUpdate();
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -1403,6 +1412,7 @@ export default {
//获取所有产线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -1411,6 +1421,9 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList);
})
.catch(() => {

34
vue/src/views/pg-fis/basedate/m100Online/index.vue
View File

@ -165,7 +165,7 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State">
<el-form-item label="单据状态" prop="State" v-show="isShowState">
<el-checkbox-group v-model="listQuery.state">
<el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id" @change="checkedListChange(index)">
{{ item.name }}
@ -385,6 +385,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -488,7 +489,7 @@ export default {
},
listPLQuery:{
BillType: 2,
//UserId: "00000000-0000-0000-0000-000000000000",
//UserId: this.userinfo.UserId,
},
hostSNQuery:{
productLine:undefined,
@ -541,6 +542,7 @@ export default {
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
isShowHostSN : false,
isShowVin : false,
isShowState:true,
};
@ -562,7 +564,6 @@ export default {
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
computed: {
@ -623,13 +624,14 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//获取当前用户信息
},
methods: {
//抽屉
handleDrawerOpen(param) {
this.drawer = true;
console.log(510)
console.log(param)
//console.log(510)
//console.log(param)
var parentId = param.assemblyID; //主键id
this.customerInfos = [
{
@ -700,7 +702,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//版本下拉选择
@ -736,7 +738,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -801,7 +803,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -823,7 +825,10 @@ export default {
});
},
valueselectChange(){this.$forceUpdate();},
valueselectChange(){
this.$forceUpdate();
},
handleImportSAP(){},
handleFilter() {
@ -1016,10 +1021,10 @@ export default {
{
if(this.listQuery.productType === 1)//门板
{
if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11)
if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) <= 0)
{
this.$message({
message: "最多只能打印12个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11),
message: "起止大众顺序号相减不能为零！",
type: "error",
});
return;
@ -1351,6 +1356,7 @@ export default {
//获取所有产线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -1359,6 +1365,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList)
})
.catch(() => {
@ -1378,12 +1386,16 @@ export default {
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id);
this.isShowState = true;
}
else if(this.listQuery.productType === 2)
{
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
this.listQuery.state = [];
this.isShowState = false;
}
},

18
vue/src/views/pg-fis/basedate/r100Online/index.vue
View File

@ -277,6 +277,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -295,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
}, {});
export default {
name: "M100Online",
name: "R100Online",
components: { Pagination, CRMTableHead, importExcel , Detail},
directives: { permission },
filters: {
@ -318,7 +319,7 @@ export default {
}
};
return {
crmType: "M100Online",
crmType: "R100Online",
rules: {
erpAssemblyName: [
{ required: true, message: "必须输入！", trigger: "blur" },
@ -416,7 +417,6 @@ export default {
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
computed: {
@ -481,6 +481,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//获取当前用户信息
},
methods: {
//抽屉
@ -546,7 +547,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//版本下拉选择
@ -582,7 +583,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -647,7 +648,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -669,7 +670,7 @@ export default {
});
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -713,6 +714,7 @@ export default {
//获取所有产线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -721,6 +723,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList)
})
.catch(() => {

1563
vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
View File

File diff suppressed because it is too large

158
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
View File

@ -1,6 +1,7 @@
<!--未知总成管理页-->
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
@ -167,6 +168,7 @@
</el-form-item>
</el-form>
</flexbox>
</div>
<div class="l-table">
<!--表格渲染-->
<el-table
@ -193,7 +195,6 @@
prop="vin"
sortable
align="center"
fixed
width="180px"
>
<template slot-scope="scope">
@ -254,6 +255,7 @@
></Detail>
</div>
</el-drawer>
</div>
<!--添加总成-->
<el-dialog
@ -318,7 +320,7 @@
</el-col>
<el-col :span="7">
<div style="border:1px;height:570px;width:270px">
<el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft">
<el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft" @select-all="selectLeftAll">
<el-table-column type="selection" width="40px"></el-table-column>
<el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
<el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
@ -338,7 +340,7 @@
</el-col>
<el-col :span="7">
<div style="border:1px;height:570px;width:270px">
<el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight">
<el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight" @select-all="selectRightAll">
<el-table-column type="selection" width="40px"></el-table-column>
<el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
<el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
@ -395,7 +397,6 @@
<el-button type="text" @click="dialogNumVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
@ -406,6 +407,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//组件计量单位
const bomUnit = [
@ -562,11 +564,12 @@ export default {
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 220;
};
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
});
},
created() {
this.getvehicleModel();
@ -741,9 +744,9 @@ export default {
handleDownload() {
this.listLoading = true;
this.$axios
.gets("/api/newjit/unknown-assembly/export", this.listQuery)
.posts("/api/newjit/unknown-assembly/export", this.listQuery)
.then((res) => {
let filename = res;
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
@ -812,6 +815,13 @@ export default {
this.formTitle = "添加总成";
this.isEdit = false;
this.form = {};
this.leftRowTemp = [];
this.rightRowTemp = [];
this.assly = {};
this.tempdetails = [];
this.erpAssemblyCfgList =[];
this.tempAssCfgList = [];
this.asTemp = [];
this.getUnknownAssemblyList();
this.getZcCode();
this.getvehicleModel();
@ -856,6 +866,7 @@ export default {
.gets("/api/newjit/unknown-assembly/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
@ -950,6 +961,7 @@ export default {
};
lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
//#region
// var lastSubmitt = [];
// console.log("flag")
// this.tempAssCfgList.forEach(element => {
@ -986,6 +998,7 @@ export default {
// })
// });
// console.log("this is lastSubmit:",lastSubmit)
//#endregion
this.$axios
.posts(
@ -1026,7 +1039,7 @@ export default {
.gets(
"/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
).then((response) => {
this.data2 = response.item.unknownAssemblyParts;
this.data2 = response.item.unknownAssemblyParts.filter(u => u.partType === "1" || u.partType === null);
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
@ -1110,30 +1123,31 @@ export default {
if(this.rightRowTemp.length === 0){
alert("请先选择需移动的零件")
}
else if(this.rightRowTemp.length !== 0 && parseInt(this.rightRowTemp[0].partNum) !== 1){
else if(this.rightRowTemp.length === 1 && parseInt(this.rightRowTemp[0].partNum) !== 1){
this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
this.dialogNumVisible = true;
this.numTitle = "输入移动结算件数量"
}
else{
console.log("R->F");
this.numFormData.num = 1;
if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
this.rightRowTemp.forEach(item => {
this.numFormData.num = item.partNum;
//if(this.numFormData.num <= item.partNum && this.numFormData.num > 0){
//数据插入最终缓存
if(this.tempAssCfgList.length !== 0){
console.log("second")
var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
if(rfMove.length !== 0){
var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
var sameDetail = rfMove[0].details.filter(u=>u.partCode === item.partCode);
if(sameDetail.length !== 0){
sameDetail[0].partNum = parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
}
else{
rfMove[0].details.push({
description: this.rightRowTemp[0].description,
description: item.description,
isKey: false,
partCode: this.rightRowTemp[0].partCode,
partCode: item.partCode,
partNum: this.numFormData.num,//移动框输入的数量
})
}
@ -1147,9 +1161,9 @@ export default {
previousVersionId: this.asTemp[0].previousVersionId,
vehicleModel: this.asTemp[0].carModel,
details:[{
description: this.rightRowTemp[0].description,
description: item.description,
isKey: false,
partCode: this.rightRowTemp[0].partCode,
partCode: item.partCode,
partNum: this.numFormData.num,//移动框输入的数量
}]
})
@ -1163,9 +1177,9 @@ export default {
isCover: false,
previousVersionId: this.asTemp[0].previousVersionId,
details:[{
description: this.rightRowTemp[0].description,
description: item.description,
isKey: false,
partCode: this.rightRowTemp[0].partCode,
partCode: item.partCode,
partNum: this.numFormData.num,//移动框输入的数量
}]
})
@ -1173,32 +1187,34 @@ export default {
console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
//数据插入中间数据源
var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
var judge = this.tempdetails.filter(u=>u.partCode === item.partCode);
if(judge.length === 1){
var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum = t;
}
else{
this.tempdetails.push({
description: this.rightRowTemp[0].description,
description: item.description,
isKey: false,
partCode: this.rightRowTemp[0].partCode,
partCode: item.partCode,
partNum: parseInt(this.numFormData.num),//移动框输入的数量
})
}
/* 右侧数据移动 */
var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
var delid = this.data2.filter(u=>u.partCode === item.partCode)[0]
var n1 = parseInt(this.numFormData.num);
var n2 = parseInt(delid.partNum);
if(n1 === n2){
this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
this.data2 = this.data2.filter(u=>u.partCode !== item.partCode);
this.rightRowTemp = [];
}
else{
this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum = delid.partNum - this.numFormData.num;
this.rightRowTemp[0].partNum = n2 - n1;
this.data2.filter(u=>u.partCode === item.partCode)[0].partNum = delid.partNum - this.numFormData.num;
item.partNum = n2 - n1;
}
}
});
//}
}
}
},
@ -1210,23 +1226,24 @@ export default {
if(this.leftRowTemp.length === 0){
alert("请先选择需移动的零件")
}
else if(this.leftRowTemp.length !== 0 && parseInt(this.leftRowTemp[0].partNum) !== 1){
else if(this.leftRowTemp.length === 1 && parseInt(this.leftRowTemp[0].partNum) !== 1){
this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
this.dialogNumVisible = true;
this.numTitle = "输入移动结算件数量"
}
else{
console.log("F->R");
this.numFormData.num = 1;
if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
this.leftRowTemp.forEach(item => {
this.numFormData.num = item.partNum;
//if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
//数据插入最终缓存
console.log("移除或删除")
var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
var samedetail = frMove[0].details.filter(u=>u.partCode === item.partCode);
if(samedetail.length !== 0){
if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
frMove[0].details = frMove[0].details.filter(u=>u.partCode !== item.partCode);
}
else{
samedetail[0].partNum = parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
@ -1239,32 +1256,35 @@ export default {
console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
//数据插入右侧数据源
var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
var judge = this.data2.filter(u=>u.partCode === item.partCode);
if(judge.length === 1){
var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
this.data2.filter(u=>u.partCode === item.partCode)[0].partNum = t;
}
else{
this.data2.push({
description: this.leftRowTemp[0].description,
description: item.description,
isKey: false,
partCode: this.leftRowTemp[0].partCode,
partCode: item.partCode,
partNum: parseInt(this.numFormData.num),//移动框输入的数量
})
}
/* 中间数据移动 */
var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
var delid = this.tempdetails.filter(u=>u.partCode === item.partCode)[0];
console.log(this.tempdetails);
var n1 = parseInt(this.numFormData.num);
var n2 = parseInt(delid.partNum);
if(n1 === n2){
this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
this.tempdetails = this.tempdetails.filter(u=>u.partCode !== item.partCode);
this.leftRowTemp = [];
}
else{
this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = parseInt(delid.partNum) - parseInt(this.numFormData.num);
this.leftRowTemp[0].partNum = n2 - n1;
this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum = parseInt(delid.partNum) - parseInt(this.numFormData.num);
item.partNum = n2 - n1;
}
}
//}
});
}
}
},
@ -1512,27 +1532,49 @@ export default {
this.rightRowTemp=[]; //清空已选
console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
// 选择项大于1时
if (selection.length > 1) {
let del_row = selection.shift();
// console.log('把数组的第一个元素从其中删除后', selection);
this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
}
this.rightRowTemp.push(selection[0])
// if (selection.length > 1) {
// let del_row = selection.shift();
// // console.log('把数组的第一个元素从其中删除后', selection);
// this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
// }
selection.forEach(item => {
this.rightRowTemp.push(item);
});
console.log('当用户手动勾选数据行', this.rightRowTemp)
},
/* 右侧复选框全选事件 */
selectRightAll(selection) {
this.rightRowTemp=[]; //清空已选
console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
selection.forEach(item => {
this.rightRowTemp.push(item);
});
console.log('当用户手动勾选全选', this.rightRowTemp)
},
/* 左侧复选框单选事件 */
selectLeft(selection, row) {
this.leftRowTemp=[]; //清空已选
console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
// 选择项大于1时
if (selection.length > 1) {
let del_row = selection.shift();
// console.log('把数组的第一个元素从其中删除后', selection);
this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
}
this.leftRowTemp.push(selection[0])
// // 选择项大于1时
// if (selection.length > 1) {
// let del_row = selection.shift();
// // console.log('把数组的第一个元素从其中删除后', selection);
// this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
// }
selection.forEach(item => {
this.leftRowTemp.push(item);
});
console.log('当用户手动勾选数据行', this.leftRowTemp)
},
/* 左侧复选框全选事件 */
selectLeftAll(selection) {
this.leftRowTemp=[]; //清空已选
console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
selection.forEach(item => {
this.leftRowTemp.push(item);
});
console.log('当用户手动勾选全选', this.leftRowTemp)
},
getvehicleModel()
{
this.$axios

20
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
View File

@ -39,7 +39,7 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.id"/>
:value="item.productLineCode"/>
</el-select>
</el-form-item>
@ -293,6 +293,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import { downloadFile } from "@/utils/crmindex.js";
@ -433,7 +434,6 @@ export default {
this.listQuery.cstate.push(element.id);
});
this.getProductLine();
this.getList();
},
computed: {
getDefaultField() {
@ -512,6 +512,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//获取当前用户信息
},
methods: {
//抽屉
@ -630,7 +631,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//版本下拉选择
@ -666,7 +667,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -712,9 +713,9 @@ export default {
if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
{
console.log(this.listQuery.cstate)
//console.log(this.listQuery.cstate)
this.listQuery.cstate.forEach(element => {
console.log(element)
//console.log(element)
if(element === 0)
{
this.listQuery.HasR100NotHasM100 = true;
@ -748,7 +749,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -770,7 +771,7 @@ export default {
});
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -814,6 +815,7 @@ export default {
//获取所有产线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -822,6 +824,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
})
.catch(() => {
});

Write Preview
Loading…
Cancel
Save