diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
index 6b74291e..e862b2ea 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
@@ -74,6 +74,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// 零件号
///
public string LU { get; set; }
+
+
+ ///
+ /// 物料描述
+ ///
+ public string MaterialDesc { get; set; }
+
+
///
/// 生产号
///
@@ -124,6 +132,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[ExporterHeader(DisplayName = "LU")]
public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc { get; set; }
+
+
+
[ExporterHeader(DisplayName = "生产码")]
public string PN { get; set; }
public string KeyCode { get; set; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
index 825c4afc..ee84a141 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
@@ -99,6 +99,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public string InvGroupNum { get; set; }
[ExporterHeader(DisplayName = "LU")]
public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc { get; set; }
+
[ExporterHeader(DisplayName = "生产码")]
public string PN { get; set; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs
new file mode 100644
index 00000000..645dba67
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs
@@ -0,0 +1,262 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+ namespace SettleAccount.Domain.BQ
+ {
+ public class BBAC_PD_DTO : EntityDto
+ {
+
+ ///
+ ///期间
+ ///
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [Display(Name = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class BBAC_PD_EXPORT
+ {
+ ///
+ ///期间
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [ExporterHeader(DisplayName = "结算单据")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [ExporterHeader(DisplayName = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [ExporterHeader(DisplayName = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class BBAC_PD_REQ_DTO : RequestInputBase
+ {
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ [Display(Name = "结算单据")]
+ public string BillNum { get; set; }
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class BBAC_PD_DETAIL_DTO : EntityDto
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [Display(Name = "工厂地点")]
+ public string Site { get; set; }
+ ///
+ /// 版本
+ ///
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ public string LU { get; set; }
+ ///
+ /// 生产码
+ ///
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+ public string KeyCode { get; set; }
+ ///
+ /// 扩展字段1
+ ///
+ public string Extend1 { get; set; }
+ ///
+ /// 扩展字段2
+ ///
+ public string Extend2 { get; set; }
+ ///
+ /// 扩展字段3
+ ///
+ public string Extend3 { get; set; }
+ ///
+ /// 扩展字段4
+ ///
+ public string Extend4 { get; set; }
+
+ }
+ public class BBAC_PD_DETAIL_EXP_DTO
+
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [ExporterHeader(DisplayName = "工厂地点")]
+ public string Site { get; set; }
+
+ ///
+ /// 版本
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ [ExporterHeader(DisplayName = "单价")]
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ [ExporterHeader(DisplayName = "下线日期")]
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ [ExporterHeader(DisplayName = "结算分组号")]
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ [ExporterHeader(DisplayName = "LU")]
+ public string LU { get; set; }
+ ///
+ /// 生产码
+ ///
+ [ExporterHeader(DisplayName = "生产码")]
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ [ExporterHeader(DisplayName = "替换LU")]
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ [ExporterHeader(DisplayName = "替换生产码")]
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+
+ //public string KeyCode { get; set; }
+ /////
+ ///// 扩展字段1
+ /////
+ //public string Extend1 { get; set; }
+ /////
+ ///// 扩展字段2
+ /////
+ //public string Extend2 { get; set; }
+ /////
+ ///// 扩展字段3
+ /////
+ //public string Extend3 { get; set; }
+ /////
+ ///// 扩展字段4
+ /////
+ //public string Extend4 { get; set; }
+
+ }
+ public class BBAC_PD_DETAIL_REQ_DTO : RequestInputBase
+ {
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+
+
+ }
+ }
+
+
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs
index c19c58f1..86f8863a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs
@@ -33,6 +33,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
[Display(Name = "零件号")]
public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc { get; set; }
+
///
/// 生产号
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs
index 5a8ee0e7..a7b7c0ff 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs
@@ -34,6 +34,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[Display(Name = "生产码")]
public string PN { get; set; }
+
+
+
///
/// 日顺序号
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
index c5586aba..fd9dfab7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
@@ -74,6 +74,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// 零件号
///
public string LU { get; set; }
+
+
+ public string MaterialDesc { get; set; }
+
+
///
/// 生产号
///
@@ -124,6 +129,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[ExporterHeader(DisplayName = "LU")]
public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc { get; set; }
+
+
[ExporterHeader(DisplayName = "生产码")]
public string PN { get; set; }
public string KeyCode { get; set; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
index 3c85479d..4f281843 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
@@ -48,6 +48,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
public string LU { get; set; }
///
+ /// 物料描述
+ ///
+ public string MaterialDesc { get; set; }
+ ///
/// 生产号
///
public string PN { get; set; }
@@ -97,6 +101,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[ExporterHeader(DisplayName = "LU")]
public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc { get; set; }
+
[ExporterHeader(DisplayName = "生产码")]
public string PN { get; set; }
public string KeyCode { get; set; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs
new file mode 100644
index 00000000..31760284
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs
@@ -0,0 +1,263 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+ public class HBPO_PD_DTO : EntityDto
+ {
+
+ ///
+ ///期间
+ ///
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [Display(Name = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class HBPO_PD_EXPORT
+ {
+ ///
+ ///期间
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [ExporterHeader(DisplayName = "结算单据")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [ExporterHeader(DisplayName = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [ExporterHeader(DisplayName = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class HBPO_PD_REQ_DTO : RequestInputBase
+ {
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ [Display(Name = "结算单据")]
+ public string BillNum { get; set; }
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class HBPO_PD_DETAIL_DTO : EntityDto
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [Display(Name = "工厂地点")]
+ public string Site { get; set; }
+ ///
+ /// 版本
+ ///
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ public string LU { get; set; }
+
+ ///
+ /// 物料描述
+ ///
+ public string MaterialDesc { get; set; }
+
+ ///
+ /// 生产码
+ ///
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+ public string KeyCode { get; set; }
+ ///
+ /// 扩展字段1
+ ///
+ public string Extend1 { get; set; }
+ ///
+ /// 扩展字段2
+ ///
+ public string Extend2 { get; set; }
+ ///
+ /// 扩展字段3
+ ///
+ public string Extend3 { get; set; }
+ ///
+ /// 扩展字段4
+ ///
+ public string Extend4 { get; set; }
+
+ }
+ public class HBPO_PD_DETAIL_EXP_DTO
+
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [ExporterHeader(DisplayName = "工厂地点")]
+ public string Site { get; set; }
+ ///
+ /// 版本
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ [ExporterHeader(DisplayName = "单价")]
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ [ExporterHeader(DisplayName = "下线日期")]
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ [ExporterHeader(DisplayName = "结算分组号")]
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ [ExporterHeader(DisplayName = "LU")]
+ public string LU { get; set; }
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string MaterialDesc{ get; set; }
+ ///
+ /// 生产码
+ ///
+ [ExporterHeader(DisplayName = "生产码")]
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ [ExporterHeader(DisplayName = "替换LU")]
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ [ExporterHeader(DisplayName = "替换生产码")]
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+
+ //public string KeyCode { get; set; }
+ /////
+ ///// 扩展字段1
+ /////
+ //public string Extend1 { get; set; }
+ /////
+ ///// 扩展字段2
+ /////
+ //public string Extend2 { get; set; }
+ /////
+ ///// 扩展字段3
+ /////
+ //public string Extend3 { get; set; }
+ /////
+ ///// 扩展字段4
+ /////
+ //public string Extend4 { get; set; }
+
+ }
+ public class HBPO_PD_DETAIL_REQ_DTO : RequestInputBase
+ {
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+
+
+ }
+
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
index 6d7a28e4..7082510c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
@@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public string InvGroupNum { get; set; }
[Display(Name = "发票分组号")]
public string LU { get; set; }
- [Display(Name = "发货单号、交付识别号")]
+ [Display(Name = "")]
public string PN { get; set; }
[Display(Name = "键值")]
public string KeyCode { get; set; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs
new file mode 100644
index 00000000..cc1fb606
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs
@@ -0,0 +1,264 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+ public class PUB_PD_DTO : EntityDto
+ {
+
+ ///
+ ///期间
+ ///
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [Display(Name = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+ [Display(Name = "业务类型")]
+ public EnumBusinessType BusinessType { get; set; }
+
+ }
+ public class PUB_PD_EXPORT
+ {
+ ///
+ ///期间
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ ///结算单据
+ ///
+ [ExporterHeader(DisplayName = "结算单据")]
+ public string BillNum { get; set; }
+ ///
+ ///关联结算单号
+ ///
+ [ExporterHeader(DisplayName = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ ///
+ ///发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ ///地点
+ ///
+ [ExporterHeader(DisplayName = "地点")]
+ public string Site { get; set; }
+
+ }
+ public class PUB_PD_REQ_DTO : RequestInputBase
+ {
+ [Display(Name = "期间")]
+ public int Version { get; set; }
+ [Display(Name = "结算单据")]
+ public string BillNum { get; set; }
+ [Display(Name = "关联结算单号")]
+ public string SettleBillNum { get; set; }
+ [Display(Name = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ [Display(Name = "地点")]
+ public string Site { get; set; }
+
+ [Display(Name = "业务类型")]
+ public EnumBusinessType BusinessType { get; set; }
+ }
+ public class PUB_PD_DETAIL_DTO : EntityDto
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [Display(Name = "工厂地点")]
+ public string Site { get; set; }
+ ///
+ /// 版本
+ ///
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ public string LU { get; set; }
+ ///
+ /// 生产码
+ ///
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+ public string KeyCode { get; set; }
+ ///
+ /// 扩展字段1
+ ///
+ public string Extend1 { get; set; }
+ ///
+ /// 扩展字段2
+ ///
+ public string Extend2 { get; set; }
+ ///
+ /// 扩展字段3
+ ///
+ public string Extend3 { get; set; }
+ ///
+ /// 扩展字段4
+ ///
+ public string Extend4 { get; set; }
+
+ }
+
+
+
+ public class PUB_PD_DETAIL_EXP_DTO
+
+ {
+
+ ///
+ ///工厂地点
+ ///
+ [ExporterHeader(DisplayName = "工厂地点")]
+ public string Site { get; set; }
+
+ ///
+ /// 版本
+ ///
+ [ExporterHeader(DisplayName = "期间")]
+ public int Version { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string BillNum { get; set; }
+ ///
+ /// 数量
+ ///
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal Qty { get; set; }
+ ///
+ /// 价格
+ ///
+ [ExporterHeader(DisplayName = "单价")]
+ public decimal Price { get; set; }
+ ///
+ /// 发票分组号
+ ///
+ [ExporterHeader(DisplayName = "发票分组号")]
+ public string InvGroupNum { get; set; }
+ ///
+ /// 下线日期
+ ///
+ [ExporterHeader(DisplayName = "下线日期")]
+ public DateTime SettleDate { get; set; }
+ ///
+ /// 结算分组号
+ ///
+ [ExporterHeader(DisplayName = "结算分组号")]
+ public string GroupNum { get; set; }
+ ///
+ /// 零件LU
+ ///
+ [ExporterHeader(DisplayName = "LU")]
+ public string LU { get; set; }
+ ///
+ /// 生产码
+ ///
+ [ExporterHeader(DisplayName = "生产码")]
+ public string PN { get; set; }
+
+ ///
+ /// 替换零件号
+ ///
+ [ExporterHeader(DisplayName = "替换LU")]
+ public string RELU { get; set; }
+ ///
+ /// 替换生产码
+ ///
+ [ExporterHeader(DisplayName = "替换生产码")]
+ public string REPN { get; set; }
+ ///
+ /// 键值
+ ///
+
+ //public string KeyCode { get; set; }
+ /////
+ ///// 扩展字段1
+ /////
+ //public string Extend1 { get; set; }
+ /////
+ ///// 扩展字段2
+ /////
+ //public string Extend2 { get; set; }
+ /////
+ ///// 扩展字段3
+ /////
+ //public string Extend3 { get; set; }
+ /////
+ ///// 扩展字段4
+ /////
+ //public string Extend4 { get; set; }
+
+ }
+
+ public class PUB_PD_DETAIL_REQ_DTO : RequestInputBase
+ {
+ ///
+ /// 发票分组号
+ ///
+ public string BillNum { get; set; }
+
+
+ }
+
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
index e6ef907e..1bbe2702 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
@@ -54,7 +54,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
[Display(Name = "结算日期")]
[ImporterHeader(Name = "Pstng Date")]
- [Required(ErrorMessage = "{0}不能为空")]
public DateTime SettleDate { set; get; }
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
index f16999ea..fd2b86dc 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
@@ -85,10 +85,8 @@ namespace Win.Sfs.SettleAccount.Bases
{
IExporter _csv = new CsvExporter();
IExporter _excel = new ExcelExporter();
-
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
var dtoDetails = ObjectMapper.Map, List>(entities);
-
var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name;
string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx";
byte[] result = null;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
index 86112931..aaf8b1d7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
@@ -1,12 +1,137 @@
-using System;
+using AutoMapper;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Csv;
+using Magicodes.ExporterAndImporter.Excel;
+using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Bases;
+using Shouldly;
+using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Entities;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Bases
{
- internal class PD_SERVICE
+ public class PD_SERVICE : ApplicationService
+ where TEntity : PD_BASE_MAIN
+ where TEntityDetail : PD_BASE
+ where TEntityDto : class, IEntityDto, new()
+ where TEntityDetailDto : class, IEntityDto, new()
+ where TRequestMainInput : RequestInputBase
+ where TRequestDetailInput : RequestInputBase
+ where TEntityDetailExportDto : class, new()
{
+
+ private readonly INormalEfCoreRepository _repository;
+ private readonly INormalEfCoreRepository _detailRepository;
+ private readonly IExcelImportAppService _excelImportService;
+
+ protected PD_SERVICE(
+ INormalEfCoreRepository repository,
+ IExcelImportAppService excelImportService,
+ INormalEfCoreRepository detailRepository
+
+ )
+ {
+ _excelImportService = excelImportService;
+ _repository = repository;
+ _detailRepository = detailRepository;
+
+
+ }
+
+ [HttpPost]
+ //[Route("detailquery")]
+ public virtual async Task> DetailQueryAsync(TRequestDetailInput input)
+ {
+
+ var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var totalCount = await _detailRepository.GetCountByFilterAsync(input.Filters);
+ var dtos = ObjectMapper.Map, List>(entitys);
+ return new PagedResultDto(totalCount, dtos);
+
+ }
+ [HttpPost]
+ //[Route("export")]
+ public virtual async Task ExportAsync(TRequestDetailInput input)
+ {
+ IExporter _csv = new CsvExporter();
+ IExporter _excel = new ExcelExporter();
+
+ var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
+ var dtoDetails = ObjectMapper.Map, List>(entities);
+
+ var classDisplayName = typeof(TEntityDetailExportDto).GetCustomAttribute()?.Name ?? typeof(TEntityDetailExportDto).Name;
+ string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx";
+ byte[] result = null;
+
+ switch (input.FileType)
+ {
+ case 0:
+ result = await _csv.ExportAsByteArray(dtoDetails);
+ break;
+ case 1:
+ result = await _excel.ExportAsByteArray(dtoDetails);
+ break;
+ }
+ result.ShouldNotBeNull();
+
+ //保存导出文件到服务器存成二进制
+ await _excelImportService.SaveBlobAsync(
+ new SaveExcelImportInputDto
+ {
+ Name = _fileName,
+ Content = result
+ }
+ );
+ return _fileName;
+ }
+ [HttpPost]
+ //[Route("generateinvoice")]
+ public virtual async Task ApprovalPassed(TRequestMainInput input)
+ {
+ return ApplicationConsts.SuccessStr;
+ }
+ [HttpPost]
+ //[Route("mainquery")]
+ public virtual async Task> MainQueryAsync(TRequestMainInput input)
+ {
+ var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
+ var dtos = ObjectMapper.Map, List>(entitys);
+ return new PagedResultDto(totalCount, dtos);
+ }
+
+ [HttpPost]
+ public virtual async Task RejectAsync(TRequestMainInput input)
+ {
+ return ApplicationConsts.SuccessStr;
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
index 5b6d9166..85c8058b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
@@ -1,17 +1,27 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
+using SettleAccount.Domain.BQ;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
+using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ
{
[AllowAnonymous]
[Route("api/settleaccount/bbac_pd_service")]
- public class BBAC_PD_SERVICE : ApplicationService
+ public class BBAC_PD_SERVICE : PD_SERVICE
{
+ protected BBAC_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository)
+ {
+ }
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs
index 244c4203..5541dd50 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs
@@ -1,17 +1,28 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
+using SettleAccount.Domain.BQ;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
+using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ
{
[AllowAnonymous]
[Route("api/settleaccount/hbpo_pd_service")]
- public class HBPO_PD_SERVICE : ApplicationService
+ public class HBPO_PD_SERVICE : PD_SERVICE
{
+ protected HBPO_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository)
+ {
+ }
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
index 9e3ef810..37157b6d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
@@ -64,8 +64,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
public virtual async Task ApprovalPassed(INVOICE_GRP_REQ_DTO input)
{
- return string.Empty;
+ return string.Empty;
}
[HttpPost]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
index 6a6fbae8..990278ea 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
@@ -1,17 +1,28 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
+using SettleAccount.Domain.BQ;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
+using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ
{
[AllowAnonymous]
[Route("api/settleaccount/pub_pd_service")]
- public class PUB_PD_SERVICE : ApplicationService
+ public class PUB_PD_SERVICE : PD_SERVICE
{
+ protected PUB_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository)
+ {
+ }
}
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
index 738f6112..f6545a99 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
@@ -80,10 +80,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
///
public PUB_SA_SERVICE(INormalEfCoreRepository repository,
INormalEfCoreRepository pubSaDetailRepository,
- INormalEfCoreRepository priceListRepository,
INormalEfCoreRepository pubCanSaRepository,
INormalEfCoreRepository pubCanSaDetailRepository,
INormalEfCoreRepository pubNotSaDetailRepository,
+ INormalEfCoreRepository priceListRepository,
+ INormalEfCoreRepository materialRelationshipRepository,
+ INormalEfCoreRepository tbRePartsRelationshipRepository,
IDistributedCache cache,
IExcelImportAppService excelImportService,
ISnowflakeIdGenerator snowflakeIdGenerator,
@@ -96,6 +98,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
_pubCanSaDetailRepository = pubCanSaDetailRepository;
_pubNotSaDetailRepository = pubNotSaDetailRepository;
_priceListRepository = priceListRepository;
+ _materialRelationshipRepository = materialRelationshipRepository;
+ _tbRePartsRelationshipRepository = tbRePartsRelationshipRepository;
}
#region 直供件
@@ -137,6 +141,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var pubCanSaDetails = new List();
//不可结算明细
var pubNotSaDetails = new List();
+ //客户零件关系
+ var materialRelationships = new List();
#region 导入数据转换、数据校验
@@ -189,10 +195,23 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
importPubSaDetail.Price = priceListEntity?.Price ?? 0;
});
- ////导入的零件号集合
- //var importPubSaLUs = importPubSaDetails.Select(t => t.LU).Distinct();
- //_materialRelationshipRepository.GetListAsync(t => t.)
+ //导入的零件号集合
+ var importPubSaLUs = importPubSaDetails.Select(t => t.LU).Distinct();
+ var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode));
+ var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
+
+ /*
+ * (不存在的客户零件号)差集
+ * 转换为厂内零件号
+ * 转换规则6个空格替换成“-”
+ */
+ var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
+ noExistSettleMaterialCodes.ForEach(t =>
+ {
+ var materialRelationship = new MaterialRelationship(GuidGenerator.Create(), t.Replace(" ", "-"), "", t);
+ materialRelationships.Add(materialRelationship);
+ });
#endregion
@@ -211,7 +230,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
pubNotSaDetails = ObjectMapper.Map, List>(pubSaDetailsNotCanSes);
#endregion
-
#region 添加入库
await _repository.InsertAsync(pubSa);
await _pubSaDetailRepository.InsertManyAsync(importPubSaDetails);
@@ -236,7 +254,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
});
await _pubNotSaDetailRepository.InsertManyAsync(pubNotSaDetails);
- }
+ }
+ if (materialRelationships.Count > 0)
+ {
+ await _materialRelationshipRepository.InsertManyAsync(materialRelationships);
+ }
#endregion
return ApplicationConsts.SuccessStr;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
index d639f03e..c10f61ca 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
@@ -73,6 +73,10 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ERP物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
}
}
+ if (checkList.Count > 0)
+ {
+ return await ExportErrorReportAsync(checkList);
+ }
foreach (var itm in _ls)
{
var _first = _repository.FirstOrDefault(p => p.ErpMaterialCode == itm.ErpMaterialCode);
@@ -86,10 +90,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
await _repository.InsertAsync(itm);
}
}
- if (checkList.Count > 0)
- {
- return await ExportErrorReportAsync(checkList);
- }
return ApplicationConsts.SuccessStr;
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs
index 72e4e8b0..891e8607 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs
@@ -51,8 +51,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
-
- foreach(TEntity p_entiy in ls)
+
+ foreach (TEntity p_entiy in ls)
{
switch (p_entiy.State)
@@ -102,33 +102,35 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
}
-
+
return true;
}
public virtual async Task SetNewState(TEntity p_entiy)
{
- p_entiy.State = SettleBillState.未结状态;
- await _repository.UpdateAsync(p_entiy);
- return true;
+ await SetNewState(p_entiy.BillNum);
+
+ return await SetNewState(p_entiy.BillNum);
}
public virtual async Task SetNewState(string billNUm)
{
- var ls=_repository.Where(p => p.InvGroupNum == billNUm).ToList();
+ var ls = _repository.Where(p => p.InvGroupNum == billNUm).ToList();
foreach (var l in ls)
{
l.State = SettleBillState.未结状态;
}
-
+
await _repository.DbContext.BulkReadAsync(ls);
return true;
}
+
}
+
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
index 30ee7f0a..7f5fe6a5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/MaterialRelationships/MaterialRelationship.cs
@@ -96,5 +96,12 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
ShipMaterailCode = shipMaterailCode;
AppraisalCategory = appraisalCategory;
}
+
+ public MaterialRelationship(Guid id, string erpMaterialCode, string materialDesc, string settlMaterialCode) : base(id)
+ {
+ ErpMaterialCode = erpMaterialCode;
+ MaterialDesc = materialDesc;
+ SettleMaterialCode = settlMaterialCode;
+ }
}
}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index 9e41384f..135b7ed9 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -280,19 +280,10 @@ namespace Win.Sfs.SettleAccount
{
b.ToTable($"{options.TablePrefix}_relationship", options.Schema);
b.ConfigureByConvention();
-
-
-
-
- //b.Property(x => x.SettleMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
- b.Property(x => x.MaterialProperty).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
- //b.Property(x => x.ShipMaterailCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
b.Property(x => x.ErpMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
b.HasIndex(x => new { x.ErpMaterialCode });
b.HasIndex(x => new { x.ErpMaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-
});
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230718010724_20230718-1.Designer.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230718010724_20230718-1.Designer.cs
new file mode 100644
index 00000000..46d5e992
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230718010724_20230718-1.Designer.cs
@@ -0,0 +1,4023 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.SettleAccount;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+ [DbContext(typeof(SettleAccountDbContext))]
+ [Migration("20230718010724_20230718-1")]
+ partial class _202307181
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+ .HasAnnotation("Relational:MaxIdentifierLength", 128)
+ .HasAnnotation("ProductVersion", "5.0.8")
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("int");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_NOT_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_NOT_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_PD_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Extend1")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend2")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend3")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend4")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("RELU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("REPN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_PD_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DNBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Site")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ShippingDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.Property("WmsBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_EDI", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Extend1")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Extend2")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Extend3")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Extend4")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Site")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_EDI");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_REPORT", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("EDIQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ShippingDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.Property("WmsBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_REPORT");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_SA_REPORT", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("CustomerOfflineTime")
+ .HasColumnType("datetime2");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("EDIQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("FixPrice")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("MateType")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("MaterialDes")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("MaterialNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PJISSeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SEQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SeqNumber")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ShippingDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.Property("WMSQty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("WmsBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SE_SA_REPORT");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.HBPO_CAN_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property