From 4d62a12193eb948fdec5a6dc773ca81bfb2a6799 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Thu, 6 Jan 2022 17:58:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=A2=E6=97=97=E5=8F=8A=E8=BD=BF?=
=?UTF-8?q?=E8=BD=A6=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BT_Car/BT_Car_PlatformImportDto.cs | 15 ----
.../BT_Car/BT_Car_PlatformAppService.cs | 7 +-
.../Entities/HQ_F/HQ_F_PlatformAppService.cs | 18 +++--
.../Entities/HQ_H/HQ_H_PlatformAppService.cs | 19 ++++--
.../Entities/HQ_M/HQ_M_PlatformAppService.cs | 18 +++--
...ttleAccountApplicationAutoMapperProfile.cs | 29 ++++++++
.../Entities/HQ_F/HQ_F_Platform.cs | 10 +++
.../Entities/HQ_H/HQ_H_Platform.cs | 10 +++
.../Entities/HQ_M/HQ_M_Platform.cs | 9 +++
...AccountDbContextModelCreatingExtensions.cs | 68 +++----------------
10 files changed, 110 insertions(+), 93 deletions(-)
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs
index 0a6598c3..5bbd5503 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs
@@ -30,21 +30,6 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
[ImporterHeader(Name = "物料凭证号")]
public string MaterialVoucherNo { get; set; }
- ///
- ///会计年度
- ///
- [ImporterHeader(Name = "会计年度")]
- public string Year { get; set; }
- ///
- /// 期间
- ///
- [ImporterHeader(Name = "期间")]
- public string Period { set; get; }
- ///
- /// 版本号
- ///
- [ImporterHeader(Name = "版本号")]
- public string Version { set; get; }
///
/// 看板号
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs
index 5eccabe0..c48b1537 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs
@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
await _query.BatchDeleteAsync();
//插入数据前检验
var checkList = new List();
- var _group = entityList.GroupBy(x => new { x.KanbanNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), KanbanNumber = p.Key.KanbanNumber, MaterialCode = p.Key.MaterialCode });
+ var _group = entityList.GroupBy(x => new { x.Factory, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory });
foreach (var itm in _group)
{
- if (string.IsNullOrEmpty(itm.KanbanNumber))
+ if (itm.Factory != "001")
{
- checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板号{1}有空,请检查!", itm.MaterialCode, itm.KanbanNumber), string.Empty));
+ checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的,请检查!", itm.Factory), string.Empty));
+ break;
}
}
var _id = GuidGenerator.Create();
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_F/HQ_F_PlatformAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_F/HQ_F_PlatformAppService.cs
index 57a9c452..dd7b82be 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_F/HQ_F_PlatformAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_F/HQ_F_PlatformAppService.cs
@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
await _query.BatchDeleteAsync();
//插入数据前检验
var checkList = new List();
- var _group = entityList.GroupBy(x => new { x.HQHKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), HQHKanBan = p.Key.HQHKanBan, MaterialCode = p.Key.MaterialCode });
+ var _group = entityList.GroupBy(x => new { x.Factory, x.HQHKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQHKanBan });
foreach (var itm in _group)
{
- if (string.IsNullOrEmpty(itm.HQHKanBan))
+ if (itm.Factory != "F")
{
- checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空,请检查!", itm.MaterialCode, itm.HQHKanBan), string.Empty));
+ checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的,请检查!", itm.Factory), string.Empty));
+ break;
}
}
var _id = GuidGenerator.Create();
@@ -97,8 +98,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
_bomList.Add(new HQ_F_PlatformVersion(_id, branchId, year, period, version, customerCode));
foreach (var itm in entityList)
{
- //赋值上主键ID
- itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+ {
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
+ }
+ else
+ {
+ //赋值上主键ID
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ }
}
if (checkList.Count > 0)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
index 178e5fc1..cea4e52d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
@@ -82,14 +82,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
//删除明细
var _query = _repository.Where(p => p.Version == version);
await _query.BatchDeleteAsync();
+
//插入数据前检验
var checkList = new List();
- var _group = entityList.GroupBy(x => new { x.HQHKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), HQHKanBan = p.Key.HQHKanBan, MaterialCode = p.Key.MaterialCode });
+ var _group = entityList.GroupBy(x => new { x.Factory, x.HQHKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQHKanBan });
foreach (var itm in _group)
{
- if (string.IsNullOrEmpty(itm.HQHKanBan))
+ if (itm.Factory != "H")
{
- checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空,请检查!", itm.MaterialCode, itm.HQHKanBan), string.Empty));
+ checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的,请检查!", itm.Factory), string.Empty));
+ break;
}
}
var _id = GuidGenerator.Create();
@@ -97,8 +99,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
_bomList.Add(new HQ_H_PlatformVersion(_id, branchId, year, period, version, customerCode));
foreach (var itm in entityList)
{
- //赋值上主键ID
- itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+ {
+ //赋值上主键ID
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "BJ");//备品库没有看板号,需要特殊标识一下BJ,已经和客户确认
+ }
+ else
+ {
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ }
}
if (checkList.Count > 0)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_M/HQ_M_PlatformAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_M/HQ_M_PlatformAppService.cs
index c0c13f65..cb1e58c1 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_M/HQ_M_PlatformAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_M/HQ_M_PlatformAppService.cs
@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
await _query.BatchDeleteAsync();
//插入数据前检验
var checkList = new List();
- var _group = entityList.GroupBy(x => new { x.HQMKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Type = p.Key.HQMKanBan, MaterialCode = p.Key.MaterialCode });
+ var _group = entityList.GroupBy(x => new { x.Factory, x.HQMKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQMKanBan });
foreach (var itm in _group)
{
- if (string.IsNullOrEmpty(itm.Type))
+ if (itm.Factory != "M")
{
- checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空,请检查!", itm.MaterialCode, itm.Type), string.Empty));
+ checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的,请检查!", itm.Factory), string.Empty));
+ break;
}
}
var _id = GuidGenerator.Create();
@@ -97,8 +98,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
_bomList.Add(new HQ_M_PlatformVersion(_id, branchId, year, period, version, customerCode));
foreach (var itm in entityList)
{
- //赋值上主键ID
- itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ if (string.IsNullOrEmpty(itm.HQMKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+ {
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
+ }
+ else
+ {
+ //赋值上主键ID
+ itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+ }
}
if (checkList.Count > 0)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 2b62117f..51cd3ac8 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -86,6 +86,7 @@ using Win.Sfs.SettleAccount.Entities.WMSSparePart;
using Win.Sfs.SettleAccount.Entities.HQ_H;
using Win.Sfs.SettleAccount.Entities.HQ_M;
using Win.Sfs.SettleAccount.Entities.HQ_F;
+using Win.Sfs.SettleAccount.Entities.BT_Car;
namespace Win.Sfs.SettleAccount
{
@@ -235,11 +236,39 @@ namespace Win.Sfs.SettleAccount
CreateMapHQ_F_Platform();
CreateMapHQ_F_PlatformVersion();
+ //一汽轿车
+ CreateMapBT_Car_Platform();
+ CreateMapBT_Car_PlatformVersion();
#endregion
}
#region PG-派格映射
+ ///
+ /// 红旗F平台导入
+ ///
+ private void CreateMapBT_Car_Platform()
+
+ {
+ CreateMap().ReverseMap();
+ CreateMap().ReverseMap();
+ CreateMap().ReverseMap();
+ CreateMap().ReverseMap();
+ CreateMap().ReverseMap();
+ }
+
+ ///
+ /// 红旗F平台-版本
+ ///
+ private void CreateMapBT_Car_PlatformVersion()
+
+ {
+ CreateMap().ReverseMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ }
///
/// 红旗F平台导入
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs
index 2b673fc8..ac90c240 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs
@@ -13,6 +13,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
public HQ_F_Platform()
{ }
+ public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+ {
+ Period = peroid;
+ Year = year;
+ Id = guid;
+ Version = version;
+ BranchId = branchId;
+ HQHKanBan = kanban;
+ }
+
public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
{
Period = peroid;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
index c34f59d0..84d0d014 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
@@ -13,6 +13,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
public HQ_H_Platform()
{ }
+ public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+ {
+ Period = peroid;
+ Year = year;
+ Id = guid;
+ Version = version;
+ BranchId = branchId;
+ HQHKanBan = kanban;
+ }
+
public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
{
Period = peroid;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs
index 779fb3b9..8ae8dd06 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs
@@ -13,6 +13,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
public HQ_M_Platform()
{ }
+ public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+ {
+ Period = peroid;
+ Year = year;
+ Id = guid;
+ Version = version;
+ BranchId = branchId;
+ HQMKanBan = kanban;
+ }
public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
{
Period = peroid;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index 1523b99f..19fded44 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -421,59 +421,6 @@ namespace Win.Sfs.SettleAccount
}
-
-
-
-
- ///
- /// 一汽轿车平台验收结算明细-导入
- ///
- ///
- ///
- private static void ConfigureHQCar(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
- {
-
- builder.Entity(b =>
- {
-
- b.ToTable($"{options.TablePrefix}_HQ_Car_Platform", options.Schema);
-
- b.ConfigureByConvention();
- b.Property(x => x.HQCarKanBan).HasMaxLength(150);//看板号(一汽轿车没有看板号)
- b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
- b.Property(x => x.Factory).HasMaxLength(50);
- b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
- b.Property(x => x.ExternalKanbanNumber).HasMaxLength(50);
- b.Property(x => x.KanbanNumber).HasMaxLength(150);//看板编号
- b.Property(x => x.Period).HasMaxLength(50);
- b.Property(x => x.Year).HasMaxLength(50);
- b.Property(x => x.Version).HasMaxLength(50);
- b.Property(x => x.Supplier).HasMaxLength(50);
- b.Property(x => x.StorageLocation).HasMaxLength(50);
- b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
- //创建组合索引
- b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
- });
- }
-
- private static void ConfigureHQCarVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
- {
-
- builder.Entity(b =>
- {
- b.ToTable($"{options.TablePrefix}_HQ_Car_PlatformVersion", options.Schema);
- b.ConfigureByConvention();
- b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
- b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
- b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
- b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
- b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
- });
-
- }
-
-
///
/// 红旗工厂F平台验收结算明细-导入
///
@@ -488,7 +435,7 @@ namespace Win.Sfs.SettleAccount
b.ToTable($"{options.TablePrefix}_HQ_F_Platform", options.Schema);
b.ConfigureByConvention();
- b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+ b.Property(x => x.HQHKanBan).HasMaxLength(150);//看板号有空的情况,如备品库
b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
b.Property(x => x.Factory).HasMaxLength(50);
b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -502,7 +449,7 @@ namespace Win.Sfs.SettleAccount
b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
b.Property(x => x.AcceptanceNo).HasMaxLength(50);
//创建组合索引
- b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+ //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
});
}
@@ -550,7 +497,7 @@ namespace Win.Sfs.SettleAccount
b.Property(x => x.StorageLocation).HasMaxLength(50);
b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
//创建组合索引
- b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+ //b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
});
}
@@ -614,7 +561,7 @@ namespace Win.Sfs.SettleAccount
b.ToTable($"{options.TablePrefix}_HQ_M_Platform", options.Schema);
b.ConfigureByConvention();
- b.Property(x => x.HQMKanBan).IsRequired().HasMaxLength(150);//必填项
+ b.Property(x => x.HQMKanBan).HasMaxLength(150);//有空的情况
b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
b.Property(x => x.Factory).HasMaxLength(50);
b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -627,7 +574,7 @@ namespace Win.Sfs.SettleAccount
b.Property(x => x.StorageLocation).HasMaxLength(50);
b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
//创建组合索引
- b.HasIndex(x => new { x.Version, x.HQMKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+ //b.HasIndex(x => new { x.Version, x.HQMKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
});
}
@@ -662,7 +609,8 @@ namespace Win.Sfs.SettleAccount
b.ToTable($"{options.TablePrefix}_HQ_H_Platform", options.Schema);
b.ConfigureByConvention();
- b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+ //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+ b.Property(x => x.HQHKanBan).HasMaxLength(150);//有空的情况
b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
b.Property(x => x.Factory).HasMaxLength(50);
b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -677,7 +625,7 @@ namespace Win.Sfs.SettleAccount
b.Property(x => x.AcceptanceNo).HasMaxLength(50);
//创建组合索引
- b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+ //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
});
}
From 2b221790d47e7e427c7fbe03ce3ca19b5f2d24f3 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Fri, 7 Jan 2022 09:26:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=A2=E6=97=97=E4=B8=80=E6=B1=BD?=
=?UTF-8?q?=E8=BD=BF=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ux/vw/dataInput/hq_h_report/index.vue | 207 ++++++------------
vue/src/views/ux/vw/dataInput/hq_y/index.vue | 4 +-
2 files changed, 64 insertions(+), 147 deletions(-)
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
index d68f47c5..6e1f5941 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
@@ -106,33 +106,6 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -261,7 +250,7 @@
multiple
filterable
clearable
- style="width: 380px; margin-right: 15px"
+ style="width: 450px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
@@ -277,66 +266,43 @@
}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -371,45 +337,15 @@
- 其他搜索条件(单击折叠或伸展)
-
-
+
@@ -418,12 +354,12 @@
v-model="formCount.kennCode"
style="width: 170px"
:rows="4"
- placeholder="多个KENN号,请以回车换行形式添加!"
+ placeholder="多个订货看板编号,请以回车换行形式添加!"
/>
-
+
@@ -432,7 +368,7 @@
style="width: 170px"
type="textarea"
:rows="4"
- placeholder="多个底盘号,请以回车换行形式添加!"
+ placeholder="多个发货零件号,请以回车换行形式添加!"
/>
@@ -440,7 +376,7 @@
-
+
@@ -449,12 +385,12 @@
style="width: 170px"
type="textarea"
:rows="4"
- placeholder="多个客户零件号,请以回车换行形式添加!"
+ placeholder="多个结算验收单号,请以回车换行形式添加!"
/>
-
+
@@ -463,6 +399,23 @@
style="width: 170px"
type="textarea"
:rows="4"
+ placeholder="多个结算零件号,请以回车换行形式添加!"
+ />
+
+
+
+
+
+
+
+
+
+
+
@@ -573,19 +526,6 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
-
- pickerOptions2: {
- disabledDate: (time) => {
- //if (this.endTime != "") {
- return time.getTime() > new Date(this.cp5endTime).getTime();
- //}
- },
- },
- pickerOptions3: {
- disabledDate: (time) => {
- return time.getTime() <= new Date(this.cp5startTime).getTime();
- },
- },
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@@ -637,8 +577,6 @@ export default {
formCount: {
startTime: "",
endTime: "",
- cp5startTime: "",
- cp5endTime: "",
// name: "未结算对比",
// settledate: "",
// materialCode: "",
@@ -647,8 +585,6 @@ export default {
// kennCode: "",
// version: "",
},
- cp5startTime: "",
- cp5endTime: "",
dataKenCode: "",
datachassisNumber: "",
datamaterialCode: "",
@@ -1129,15 +1065,6 @@ export default {
this.getbalanceIndexData();
},
- //cp5
- getdateValueCp5(val) {
- this.cp5startTime = val;
- this.getbalanceIndexData();
- },
- getdateValCp5(val) {
- this.cp5endTime = val;
- this.getbalanceIndexData();
- },
getCurrentMonthFirst() {
var date = new Date();
date.setDate(1);
@@ -1224,8 +1151,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
- this.cp5startTime = "";
- this.cp5endTime = "";
},
save() {
this.$refs.formCount.validate((valid) => {
@@ -1241,16 +1166,10 @@ export default {
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
}
- this.listExportQuery.begin = this.cp5startTime
- ? this.cp5startTime
- : undefined;
- this.listExportQuery.end = this.cp5endTime
- ? this.cp5endTime
- : undefined;
- this.listExportQuery.cp7Begin = this.startTime
+ this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;
- this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
+ this.listExportQuery.end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
}
@@ -1302,8 +1221,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
- this.cp5startTime = "";
- this.cp5endTime = "";
this.dialogFormVisible = true;
},
kennBtn() {
diff --git a/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/vue/src/views/ux/vw/dataInput/hq_y/index.vue
index 0b86b2c4..cfcc0f30 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y/index.vue
@@ -46,7 +46,7 @@
v-model="searchContent"
clearable
size="small"
- placeholder="按照看板号搜索..."
+ placeholder="按照看板编号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
@@ -534,7 +534,7 @@ export default {
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
- var column = "btCarKanBan";
+ var column = "kanbanNumber";
let filter = {
logic: 0,
column: column,