From 5a5d0272e8b2321324f14de018accf966f528e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 10 Jul 2023 09:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.Domain/Bases/EntityBase.cs | 265 ++++++++++- .../Entities/BQ/BBAC_CAN_SA.cs | 138 ++++++ .../Entities/BQ/BBAC_NOT_SA_DETAIL.cs | 103 ++++ .../Entities/BQ/BBAC_PD_DETAIL.cs | 66 +++ .../Entities/BQ/BBAC_SA.cs | 131 ++++++ .../Entities/BQ/BBAC_SE_DETAIL.cs | 60 +++ .../Entities/BQ/BBAC_SE_EDI.cs | 51 ++ .../Entities/BQ/BBAC_SE_REPORT.cs | 60 +++ .../Entities/BQ/BBAC_SE_SA_REPORT.cs | 78 +++ .../Entities/BQ/HBPO_CAN_SA.cs | 122 +++++ .../Entities/BQ/HBPO_NOT_SA_DETAIL.cs | 111 +++++ .../Entities/BQ/HBPO_PD_DETAIL.cs | 64 +++ .../Entities/BQ/HBPO_SA.cs | 124 +++++ .../Entities/BQ/HBPO_SE_DETAIL.cs | 59 +++ .../Entities/BQ/HBPO_SE_EDI.cs | 51 ++ .../Entities/BQ/HBPO_SE_REPORT.cs | 60 +++ .../Entities/BQ/HBPO_SE_SA_REPORT.cs | 101 ++++ .../Entities/BQ/INVOICE_GRP.cs | 102 ++++ .../Entities/BQ/INVOICE_MAP_GROUP.cs | 33 ++ .../Entities/BQ/INVOICE_NOT_SETTLE.cs | 42 ++ .../Entities/BQ/INVOICE_WAIT_DETAIL.cs | 64 +++ .../Entities/BQ/JIT_SE_SA_REPORT.cs | 103 ++++ .../Entities/BQ/M_PD_DETAIL.cs | 49 ++ .../Entities/BQ/Material.cs | 445 ++++++++++++++++++ .../Entities/BQ/MaterialRelationship.cs | 11 + .../Entities/BQ/PUB_CAN_SA.cs | 131 ++++++ .../Entities/BQ/PUB_NOT_SA_DETAIL.cs | 92 ++++ .../Entities/BQ/PUB_PD_DETAIL.cs | 73 +++ .../Entities/BQ/PUB_SA.cs | 120 +++++ .../Entities/BQ/PUB_SE_DETAIL.cs | 66 +++ .../Entities/BQ/PURCHASE_PRICE.cs | 11 + .../Entities/BQ/TB_PRICE_BJ.cs | 36 ++ .../Entities/BQ/TB_PRICE_LIST.cs | 52 ++ .../Entities/BQ/TB_RePartsRelationship.cs | 35 ++ .../ISettleAccountBranchEfCoreRepository.cs | 2 +- .../SettleAccount.Domain.csproj | 2 +- 36 files changed, 3104 insertions(+), 9 deletions(-) create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_NOT_SA_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_REPORT.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_SA_REPORT.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_EDI.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_REPORT.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_SA_REPORT.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_MAP_GROUP.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/JIT_SE_SA_REPORT.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/M_PD_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Material.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/MaterialRelationship.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_BJ.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_LIST.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index a9222561..23b56038 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Security.Policy; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Domain.Entities.Auditing; using Win.Sfs.SettleAccount.Entities.SettleAccountDomain; using static System.Runtime.CompilerServices.RuntimeHelpers; @@ -29,7 +30,7 @@ namespace SettleAccount.Bases /// /// 发货数量、结算数量、扣减数量 /// - public string Qty { set; get; } + public decimal Qty { set; get; } } public interface ISA_BASE : ISBASE @@ -49,7 +50,13 @@ namespace SettleAccount.Bases /// /// 结算日期 /// - public string SettleDate { set; get; } + public DateTime SettleDate { set; get; } + + /// + /// 结算分组号 + /// + public string GroupNum { set; get; } + } @@ -70,11 +77,13 @@ namespace SettleAccount.Bases /// /// 结算日期 /// - public string SettleDate { set; get; } + public DateTime SettleDate { set; get; } + + public string InvGroupNum { set; get; } /// /// 结算分组号 /// - public string InvGroupNum { set; get; } + public string GroupNum { set; get; } } public interface ISA_NOT_BASE : ISBASE @@ -99,6 +108,10 @@ namespace SettleAccount.Bases /// 结算分组号 /// public string InvGroupNum { set; get; } + /// + /// 结算分组号 + /// + public string GroupNum { set; get; } } @@ -113,9 +126,39 @@ namespace SettleAccount.Bases public string WmsBillNum { set; get; } + } - + public class RE_BASE : IRE_BASE + { + /// 发货时间 + /// + public DateTime ShippingDate { set; get; } + /// + /// 发运单号 + /// + public string WmsBillNum { set; get; } + /// + /// 扣減數據量 + /// + public decimal Qty { set; get; } + /// + /// 零件號 + /// + public string LU { get; set ; } + /// + /// 發貨單號、 + /// + public string PN { get; set ; } + /// + /// + /// + public string KeyCode { get; set ; } } + + + + + public interface ISE_BASE : ISBASE { /// @@ -134,12 +177,29 @@ namespace SettleAccount.Bases } public interface IPD_BASE : ISBASE { - public string Version { set; get; } + /// + /// 期間 + /// + public int Version { set; get; } + /// + /// 結算單號 + /// public string BillNum { set; get; } - public string Qty { set; get; } + /// + /// 單價 + /// public string Price { set; get; } + /// + /// 發票分組號 + /// public string InvGroupNum { set; get; } + /// + /// 結算日期 + /// public string SettleDate { set; get; } + /// + /// 結算分組號 + /// public string GroupNum { set; get; } } @@ -163,6 +223,197 @@ namespace SettleAccount.Bases } + public class SA_BASE : FullAuditedAggregateRoot, ISA_BASE + { + /// + /// 期间 + /// + public int Version { set; get; } + /// + /// 单价 + /// + public decimal Price { set; get; } + /// + /// 结算单 + /// + public string BillNum { set; get; } + /// + /// 结算日期 + /// + public DateTime SettleDate { set; get; } + /// + /// 零件號 + /// + public string LU { get ; set ; } + /// + /// 生產號 + /// + public string PN { get; set ; } + /// + /// 組合鍵值（LU+PN） + /// + public string KeyCode { get ; set ; } + /// + /// 數量 + /// + public decimal Qty { get ; set ; } + /// + /// 結算分組號 + /// + public string GroupNum { get ; set ; } + } + + public class SA_CAN_BASE : FullAuditedAggregateRoot, ISA_CAN_BASE + { + /// + /// 期间 + /// + public int Version { set; get; } + /// + /// 单价 + /// + public decimal Price { set; get; } + /// + /// 可出库结算单 + /// + public string BillNum { set; get; } + /// + /// 结算日期 + /// + public DateTime SettleDate { set; get; } + /// + /// 發票分組號 + /// + public string InvGroupNum { set; get; } + /// + /// 零件號 + /// + public string LU { get; set; } + /// + /// 生產號 + /// + public string PN { get; set; } + /// + /// 組合鍵值（LU+PN） + /// + public string KeyCode { get; set; } + /// + /// 數量 + /// + public decimal Qty { get; set; } + /// + /// 結算分組號 + /// + public string GroupNum { get; set; } + } + public class SA_NOT_BASE : FullAuditedAggregateRoot, ISA_NOT_BASE + { + /// + /// 单价 + /// + public decimal Price { set; get; } + /// + /// 期间 + /// + public int Version { set; get; } + /// + /// 原结算单号 + /// + public string SettleBillNum { set; get; } + /// + /// 结算日期 + /// + public DateTime SettleDate { set; get; } + /// + /// 發票分组号 + /// + public string InvGroupNum { set; get; } + /// + /// 零件號 + /// + public string LU { get; set; } + /// + /// 生產號 + /// + public string PN { get; set; } + /// + /// 組合鍵值（LU+PN） + /// + public string KeyCode { get; set; } + /// + /// 數量 + /// + public decimal Qty { get; set; } + /// + /// 結算分組號 + /// + public string GroupNum { get; set; } + } + + + public class SE_BASE : FullAuditedAggregateRoot, ISE_BASE + { + /// + /// 期间 + /// + public int Version { set; get; } + /// + /// 发货时间 + /// + public DateTime ShippingDate { set; get; } + /// + /// 发运单号 + /// + public string WmsBillNum { set; get; } + + + + + /// + /// 零件號 + /// + public string LU { get; set; } + /// + /// 生產號 + /// + public string PN { get; set; } + /// + /// 組合鍵值（LU+PN） + /// + public string KeyCode { get; set; } + /// + /// 數量 + /// + public decimal Qty { get; set; } + + + + + + + + + } + public class PD_BASE : FullAuditedAggregateRoot, ISBASE + { + + public int Version { set; get; } + public string BillNum { set; get; } + public decimal Qty { set; get; } + public decimal Price { set; get; } + public string InvGroupNum { set; get; } + public DateTime SettleDate { set; get; } + public string GroupNum { set; get; } + 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; } + + + } + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs new file mode 100644 index 00000000..709f6660 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs @@ -0,0 +1,138 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC可结算导入")] +public class BBAC_CAN_SA:FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "结算单据")] + public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + /// + /// 明细记录行数 + /// + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } = null!; + + public BBAC_CAN_SA(Guid guid, int version, string billNum, string settleBillNum, string state, string invGroupNum) + { + Id = guid; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + State = state; + InvGroupNum = invGroupNum; + } +} + +[Display(Name = "BBAC可结算导入明细")] +public class BBAC_CAN_SA_DETAIL: SA_CAN_BASE +{ + ///// + ///// 对应字段（Material+ExternalCalNumber） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + ///// + ///// 对应字段Material + ///// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段ExternalCalNumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + /// + /// 匹配价格表对应区间对应地点带出 + /// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + /// + /// ExternalCallNumber包含（R0）为买单件 1为JIS 2.为买单件 + /// + [Display(Name = "业务类别")] + public string Category { get; set; } = null!; + + /// + /// 对应字段MovementType，996正常，997为退货 + /// + [Display(Name = "是否退货")] + public string IsReturn { get; set; } = null!; + + /// + /// 对应字段PostingDate + /// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + /// + /// 对应字段Reference + /// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + public BBAC_CAN_SA_DETAIL(Guid guid,string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, DateTime settleDate, string groupNum, string invGroupNum) + { + Id = guid; + KeyCode = keyCode; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + Category = category; + IsReturn = isReturn; + SettleDate = settleDate; + GroupNum = groupNum; + InvGroupNum = invGroupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_NOT_SA_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_NOT_SA_DETAIL.cs new file mode 100644 index 00000000..76e29484 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_NOT_SA_DETAIL.cs @@ -0,0 +1,103 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + +namespace SettleAccount.Domain.BQ; + + +[Display(Name = "BBAC不可结算导入明细")] +public class BBAC_NOT_SA_DETAIL:SA_NOT_BASE +{ + ///// + ///// 对应字段（Material+ExternalCalNumber） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string SettleBillNum { get; set; } = null!; + + ///// + ///// 对应字段Material + ///// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段ExternalCalNumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间对应地点带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + /// + /// ExternalCallNumber包含（R0）为买单件 1为JIS 2.为买单件 + /// + [Display(Name = "业务类别")] + public string Category { get; set; } = null!; + + /// + /// 对应字段MovementType，996正常，997为退货 + /// + [Display(Name = "是否退货")] + public string IsReturn { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + ///// + ///// 对应字段PostingDate + ///// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + /// + /// 对应字段Reference + /// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public BBAC_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, string invGroupNum, DateTime settleDate, string groupNum) + { + KeyCode = keyCode; + Version = version; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + Category = category; + IsReturn = isReturn; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs new file mode 100644 index 00000000..76abc1e2 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs @@ -0,0 +1,66 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC待扣减实体")] +public class BBAC_PD_DETAIL:PD_BASE +{ + //[Display(Name = "LU+ASN单号")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "替换零件号")] + //public string RELU { get; set; } = null!; + + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + //[Display(Name = "替换生产号")] + //public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public BBAC_PD_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string groupNum) + { + Id = guid; + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + RELU = rELU; + PN = pN; + REPN = rEPN; + Site = site; + Qty = qty; + Price = price; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs new file mode 100644 index 00000000..a2189d65 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs @@ -0,0 +1,131 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; + + +[Display(Name = "BBAC结算导入")] +public class BBAC_SA:FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "结算单据")] + + public string BillNum { get; set; } = null!; + + [Display(Name = "出库单号")] + public string DNBillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + public BBAC_SA(int version, string billNum, string dNBillNum, string state) + { + Version = version; + BillNum = billNum; + DNBillNum = dNBillNum; + State = state; + } +} +[Display(Name = "BBAC结算导入明细")] + +public class BBAC_SA_DETAIL:SA_BASE +{ + /// + /// 对应字段（Material+ExternalCalNumber） + /// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + /// + /// 对应字段Material + /// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + /// + /// 对应字段ExternalCalNumber + /// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间对应地点带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + /// + /// ExternalCallNumber包含（R0）为买单件 1为JIS 2.为买单件 + /// + [Display(Name = "业务类别")] + public string Category { get; set; } = null!; + + /// + /// 对应字段MovementType，996正常，997为退货 + /// + [Display(Name = "是否退货")] + public string IsReturn { get; set; } = null!; + + /// + /// 对应字段PostingDate + /// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + ///// + ///// 对应字段Reference + ///// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + public BBAC_SA_DETAIL(string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, DateTime settleDate, string groupNum, string invGroupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + Category = category; + IsReturn = isReturn; + SettleDate = settleDate; + GroupNum = groupNum; + //InvGroupNum = invGroupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs new file mode 100644 index 00000000..62bb7103 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs @@ -0,0 +1,60 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "BBAC发运单")] +public class BBAC_SE_DETAIL:SE_BASE +{ + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + //[Display(Name = "发货数量")] + //public decimal Qty { get; set; } + + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } + + //[Display(Name = "发货时间")] + //public DateTime ShippingDate { get; set; } + + //[Display(Name = "Wms发货单号")] + //public string WmsBillNum { get; set; } = null!; + + public BBAC_SE_DETAIL(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + BeginDate = beginDate; + ShippingDate = shippingDate; + WmsBillNum = wmsBillNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs new file mode 100644 index 00000000..8a37e971 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs @@ -0,0 +1,51 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC的EDI数据")] +public class BBAC_SE_EDI:FullAuditedAggregateRoot +{ + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "EDI数量")] + public decimal Qty { get; set; } + + [Display(Name = "订货时间")] + public DateTime BeginDate { get; set; } + + public BBAC_SE_EDI(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + BeginDate = beginDate; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_REPORT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_REPORT.cs new file mode 100644 index 00000000..c9bbb1fb --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_REPORT.cs @@ -0,0 +1,60 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC发运数据和EDI对比实体")] +public class BBAC_SE_REPORT:FullAuditedAggregateRoot +{ + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "发货数量")] + public decimal Qty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } + + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + + public BBAC_SE_REPORT(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + EDIQty = eDIQty; + BeginDate = beginDate; + ShippingDate = shippingDate; + WmsBillNum = wmsBillNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_SA_REPORT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_SA_REPORT.cs new file mode 100644 index 00000000..c3b7c178 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_SA_REPORT.cs @@ -0,0 +1,78 @@ +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC发运数据与结算数据对比实体")] +public class BBAC_SE_SA_REPORT +{ + + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + [Display(Name = "期间")] + public int Version { get; set; } + + public BBAC_SE_SA_REPORT(string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version) + { + KeyCode = keyCode; + Category = category; + WmsBillNum = wmsBillNum; + ShippingDate = shippingDate; + PN = pN; + SeqNumber = seqNumber; + PJISSeqNumber = pJISSeqNumber; + MaterialNumber = materialNumber; + MaterialDes = materialDes; + LU = lU; + CustomerOfflineTime = customerOfflineTime; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + SEQty = sEQty; + WMSQty = wMSQty; + EDIQty = eDIQty; + MateType = mateType; + FixPrice = fixPrice; + Version = version; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs new file mode 100644 index 00000000..14d356d8 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs @@ -0,0 +1,122 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO可结算导入")] +public class HBPO_CAN_SA +{ + [Display(Name = "期间")] + public int Version { get; set; } + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + [Display(Name = "结算单据")] + + public string BillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + /// + /// 明细记录行数 + /// + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } = null!; + + public HBPO_CAN_SA(int version, string settleBillNum, string billNum, string state, string invGroupNum) + { + Version = version; + SettleBillNum = settleBillNum; + BillNum = billNum; + State = state; + InvGroupNum = invGroupNum; + } +} +[Display(Name = "HBPO可结算导入明细")] + +public class HBPO_CAN_SA_DETAIL:SA_CAN_BASE +{ + ///// + ///// 对应字段（PartNumber+ProductioNumber） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + /// + /// 对应字段PartNumber + /// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段productionlumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 对应字段filename 区分 cn1、cn5 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + ///// + ///// 对应字段Qty + ///// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + ///// + ///// 对应字段ReceiveDate + ///// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + /// + /// 对应字段DeliveryNode + /// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + public HBPO_CAN_SA_DETAIL(Guid id ,string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum) + { + Id = id; + KeyCode = keyCode; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + SettleDate = settleDate; + GroupNum = groupNum; + InvGroupNum = invGroupNum; + } +} + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs new file mode 100644 index 00000000..e05cdbe6 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs @@ -0,0 +1,111 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +// +//[Display(Name = "HBPO不可结算导入")] +//public class HBPO_NOT_SA: BaseEntity +//{ +// [Display(Name = "期间")] +// public int Version { get; set; } + +// [Display(Name = "结算单据")] +// [OneToMany] +// public string BillNum { get; set; } = null!; + +// [Display(Name = "出库单号")] +// public string DNBillNum { get; set; } = null!; + +// /// +// /// 1、新建 2、已有出库3、已有扣减寄售库 +// /// +// [Display(Name = "状态")] +// public string State { get; set; } = null!; + +// /// +// /// 明细记录行数 +// /// +// [Display(Name = "明细记录行数")] +// public string RecordCount { get; set; } = null!; +//} +[Display(Name = "HBPO不可结算导入明细")] +public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE +{ + ///// + ///// 对应字段（PartNumber+ProductioNumber） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单号")] + //public string SettleBillNum { get; set; } = null!; + + ///// + ///// 对应字段PartNumber + ///// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段productionlumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 对应字段filename 区分 cn1、cn5 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Qty + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + /// + /// 匹配价格表对应区间带出 + /// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + /// + /// 对应字段ReceiveDate + /// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + ///// + ///// 对应字段DeliveryNode + ///// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + public HBPO_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum) + { + KeyCode = keyCode; + Version = version; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + SettleDate = settleDate; + GroupNum = groupNum; + InvGroupNum = invGroupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD_DETAIL.cs new file mode 100644 index 00000000..d479f116 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD_DETAIL.cs @@ -0,0 +1,64 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO待扣减实体")] +public class HBPO_PD_DETAIL :PD_BASE +{ + //[Display(Name = "LU+ASN单号")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "替换零件号")] + //public string RELU { get; set; } = null!; + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + //[Display(Name = "替换生产号")] + //public string REPN { get; set; } = null!; + //[Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public HBPO_PD_DETAIL(string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string groupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + RELU = rELU; + PN = pN; + REPN = rEPN; + Site = site; + Qty = qty; + Price = price; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs new file mode 100644 index 00000000..5c575993 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs @@ -0,0 +1,124 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO结算导入")] +public class HBPO_SA :FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "结算单据")] + + public string BillNum { get; set; } = null!; + + [Display(Name = "出库单号")] + public string DNBillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + /// + /// 明细记录行数 + /// + [Display(Name = "明细记录行数")] + public string RecordCount { get; set; } = null!; + + public HBPO_SA(int version, string billNum, string dNBillNum, string state, string recordCount) + { + Version = version; + BillNum = billNum; + DNBillNum = dNBillNum; + State = state; + RecordCount = recordCount; + } +} + +[Display(Name = "HBPO结算导入明细")] + +public class HBPO_SA_DETAIL :SA_BASE + +{ + ///// + ///// 对应字段（PartNumber+ProductioNumber） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + ///// + ///// 对应字段PartNumber + ///// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段productionlumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 对应字段filename 区分 cn1、cn5 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Qty + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + ///// + ///// 对应字段ReceiveDate + ///// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + ///// + ///// 对应字段DeliveryNode + ///// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + public HBPO_SA_DETAIL(string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + SettleDate = settleDate; + GroupNum = groupNum; + InvGroupNum = invGroupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs new file mode 100644 index 00000000..a4f14900 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs @@ -0,0 +1,59 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "HBPO发运数据")] +public class HBPO_SE_DETAIL :SE_BASE +{ + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + //[Display(Name = "发货数量")] + //public decimal Qty { get; set; } + + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } + + //[Display(Name = "发货时间")] + //public DateTime ShippingDate { get; set; } + + //[Display(Name = "Wms发货单号")] + //public string WmsBillNum { get; set; } = null!; + + public HBPO_SE_DETAIL(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + BeginDate = beginDate; + ShippingDate = shippingDate; + WmsBillNum = wmsBillNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_EDI.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_EDI.cs new file mode 100644 index 00000000..1113cc61 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_EDI.cs @@ -0,0 +1,51 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO的EDI数据")] +public class HBPO_SE_EDI :FullAuditedAggregateRoot +{ + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "EDI数量")] + public decimal Qty { get; set; } + + [Display(Name = "订货时间")] + public DateTime BeginDate { get; set; } + + public HBPO_SE_EDI(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + BeginDate = beginDate; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_REPORT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_REPORT.cs new file mode 100644 index 00000000..53a7e8bf --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_REPORT.cs @@ -0,0 +1,60 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO发运数据和EDI对比实体")] +public class HBPO_SE_REPORT :FullAuditedAggregateRoot +{ + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "发货数量")] + public decimal Qty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } + + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + + public HBPO_SE_REPORT(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + SeqNumber = seqNumber; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + Qty = qty; + EDIQty = eDIQty; + BeginDate = beginDate; + ShippingDate = shippingDate; + WmsBillNum = wmsBillNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_SA_REPORT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_SA_REPORT.cs new file mode 100644 index 00000000..585e39e8 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_SA_REPORT.cs @@ -0,0 +1,101 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO发运数据与结算数据对比实体")] +public class HBPO_SE_SA_REPORT :RE_BASE +{ + //[Display(Name = "LU+ASN单号")] + //public string KeyCode { get; set; } = null!; + + /// + /// 有结算无发货（无EDI数据) + ///有结算无发货（有EDI数据) + ///有结算有发货（无EDI数据) + ///有结算有发货（无价格信息) + ///有结算有发货（有EDI数据) + ///无结算有发货（有EDI数据) + ///无结算有发货（无EDI数据) + ///有结算有发货（有EDI数据) + ///有结算有发货（WMS多发） + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + //[Display(Name = "Wms发货单号")] + //public string WmsBillNum { get; set; } = null!; + + //[Display(Name = "发货时间")] + //public DateTime ShippingDate { get; set; } + + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + + [Display(Name = "期间")] + public int Version { get; set; } + + public HBPO_SE_SA_REPORT(string keyCode, string category, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version) + { + KeyCode = keyCode; + Category = category; + + SeqNumber = seqNumber; + PJISSeqNumber = pJISSeqNumber; + MaterialNumber = materialNumber; + MaterialDes = materialDes; + CustomerOfflineTime = customerOfflineTime; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + SEQty = sEQty; + WMSQty = wMSQty; + EDIQty = eDIQty; + MateType = mateType; + FixPrice = fixPrice; + Version = version; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs new file mode 100644 index 00000000..9aa765ca --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs @@ -0,0 +1,102 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "发票分组")] +public class INVOICE_GRP : FullAuditedAggregateRoot +{ + [Display(Name = "实际纸质发票号")] + public string RealnvBillNum { get; set; } = null!; + + [Display(Name = "系统生成发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "未税金额")] + public decimal Amt { get; set; } + + [Display(Name = "税后金额")] + public decimal TaxAmt { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "开票Excel文件")] + public string FileName { get; set; } = null!; + + /// + /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; + + public INVOICE_GRP(string realnvBillNum, string invbillNum, decimal amt, decimal taxAmt, string invGroupNum, string fileName, string businessType) + { + RealnvBillNum = realnvBillNum; + InvbillNum = invbillNum; + Amt = amt; + TaxAmt = taxAmt; + InvGroupNum = invGroupNum; + FileName = fileName; + BusinessType = businessType; + } +} + +//[ShangWuShenHeGroup] +//[Hidden] +//[Display(Name = "财务管理审核明细")] +//public class INVOICE_DETAIL : BaseEntity +//{ +// [Display(Name = "零件号")] +// public string LU { get; set; } = null!; + +// [Display(Name = "单价")] +// public decimal PRICE { get; set; } + +// [Display(Name = "数量")] +// public decimal Qty { get; set; } + +// [Display(Name = "金额")] +// public decimal Amt { get; set; } + +// [Display(Name = "发票号")] +// public string InvbillNum { get; set; } = null!; +// [Display(Name = "发票分组号")] +// public string InvGroupNum { get; set; } = null!; +//[ShangWuShenHeGroup] +//[Display(Name = "待开票明细")] +//public class INVOICE_WAIT_DETAIL : BaseEntity +//{ +// [Display(Name = "发票号")] +// public string InvbillNum { get; set; } = null!; + +// [Display(Name = "零件号")] +// public string LU { get; set; } = null!; + +// [Display(Name = "单价")] +// public decimal PRICE { get; set; } + +// [Display(Name = "数量")] +// public decimal Qty { get; set; } + +// [Display(Name = "金额")] +// public decimal Amt { get; set; } + +// [Display(Name = "扩展字段1")] +// public string Extend1 { get; set; } = null!; + +// [Display(Name = "扩展字段2")] +// public string Extend2 { get; set; } = null!; + +// [Display(Name = "扩展字段3")] +// public string Extend3 { get; set; } = null!; + +// [Display(Name = "扩展字段4")] +// public string Extend4 { get; set; } = null!; +// [Display(Name = "期间")] +// public int Version { get; set; } +// [Display(Name = "发票分组号")] +// public string InvGroupNum { get; set; } = null!; +// [Display(Name = "业务分类")] +// public string BussiessType { get; set; } = null!; +//} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_MAP_GROUP.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_MAP_GROUP.cs new file mode 100644 index 00000000..13f23c3b --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_MAP_GROUP.cs @@ -0,0 +1,33 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "发票和结算分组对应关系")] + +public class INVOICE_MAP_GROUP : FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算分组号")] + public string SettleGroupNum { get; set; } = null!; + + [Display(Name = "金额")] + public decimal Amt { get; set; } + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs new file mode 100644 index 00000000..e1a0bb5a --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs @@ -0,0 +1,42 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "不可结算零件号")] + +public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算分组号")] + public string SettleGroupNum { get; set; } = null!; + + [Display(Name = "可结算零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "不可结算零件号")] + public string LU1 { get; set; } = null!; + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + public INVOICE_NOT_SETTLE(int version, string invGroupNum, string settleGroupNum, string lU, string lU1, string extend1, string extend2) + { + Version = version; + InvGroupNum = invGroupNum; + SettleGroupNum = settleGroupNum; + LU = lU; + LU1 = lU1; + Extend1 = extend1; + Extend2 = extend2; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs new file mode 100644 index 00000000..7030fa45 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs @@ -0,0 +1,64 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "待开票明细")] +public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "单价")] + public decimal PRICE { get; set; } + + [Display(Name = "数量")] + public decimal Qty { get; set; } + + [Display(Name = "金额")] + public decimal Amt { get; set; } + + /// + /// 1、BBAC-JIS 2、HBPO-JIS 3、JIT 4、备件 5、印度件 + /// + [Display(Name = "业务分类")] + public string BussiessType { get; set; } = null!; + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展字段3")] + public string Extend3 { get; set; } = null!; + + [Display(Name = "扩展字段4")] + public string Extend4 { get; set; } = null!; + + public INVOICE_WAIT_DETAIL(int version, string invbillNum, string invGroupNum, string lU, decimal pRICE, decimal qty, decimal amt, string bussiessType, string extend1, string extend2, string extend3, string extend4) + { + Version = version; + InvbillNum = invbillNum; + InvGroupNum = invGroupNum; + LU = lU; + PRICE = pRICE; + Qty = qty; + Amt = amt; + BussiessType = bussiessType; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + Extend4 = extend4; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/JIT_SE_SA_REPORT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/JIT_SE_SA_REPORT.cs new file mode 100644 index 00000000..bce00559 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/JIT_SE_SA_REPORT.cs @@ -0,0 +1,103 @@ +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "JIT发运数据与结算数据对比实体")] +public class JIT_SE_SA_REPORT +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + /// + /// 有结算无发货（无EDI数据) + ///有结算无发货（有EDI数据) + ///有结算有发货（无EDI数据) + ///有结算有发货（无价格信息) + ///有结算有发货（有EDI数据) + ///无结算有发货（有EDI数据) + ///无结算有发货（无EDI数据) + ///有结算有发货（有EDI数据) + ///有结算有发货（WMS多发） + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + + [Display(Name = "期间")] + public int Version { get; set; } + + public JIT_SE_SA_REPORT(string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version) + { + KeyCode = keyCode; + Category = category; + WmsBillNum = wmsBillNum; + ShippingDate = shippingDate; + PN = pN; + SeqNumber = seqNumber; + PJISSeqNumber = pJISSeqNumber; + MaterialNumber = materialNumber; + MaterialDes = materialDes; + LU = lU; + CustomerOfflineTime = customerOfflineTime; + AssemblyCode = assemblyCode; + InjectionCode = injectionCode; + SEQty = sEQty; + WMSQty = wMSQty; + EDIQty = eDIQty; + MateType = mateType; + FixPrice = fixPrice; + Version = version; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/M_PD_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/M_PD_DETAIL.cs new file mode 100644 index 00000000..3fbb1e71 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/M_PD_DETAIL.cs @@ -0,0 +1,49 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "买单件待扣减实体")] +public class M_PD_DETAIL : FullAuditedAggregateRoot +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "替换零件号")] + public string RELU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "替换生产号")] + public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "单价")] + public decimal Price { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Material.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Material.cs new file mode 100644 index 00000000..7b24b73c --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Material.cs @@ -0,0 +1,445 @@ +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "物料主数据")] +public class Material +{ +} + +//[Order(8)] +//[SystemManagement] +//[Display(Name = "客户零件关系")] +//public class Class2 : BaseEntity +//{ +//} + +//[Order(9)] +//[SystemManagement] +//[Display(Name = "客户端替换件关系")] +//public class Class3 : BaseEntity +//{ +//} + +//[Order(10)] +//[SystemManagement] +//[Display(Name = "寄售库出库总成替换关系")] +//public class Class4 : BaseEntity +//{ +//} + +//[Order(11)] +//[SystemManagement] +//[Display(Name = "期间设置")] +//public class Class5 : BaseEntity +//{ +//} + +//[Order(12)] +//[SystemManagement] +//[Display(Name = "销售价格单")] +//public class TB_PRICE_LIST : BaseEntity +//{ +//} + +//[Order(2)] +//[Display(Name = "EDI业务")] +//public class EdiAttribute : GroupAttribute +//{ +//} + +//[Order(1)] +//[Edi] +//[Display(Name = "EDI和HBPO核对")] +//public class Class7 : BaseEntity +//{ +//} + +//[Order(2)] +//[Edi] +//[Display(Name = "EDI和BBAC核对")] +//public class Class8 : BaseEntity +//{ +//} + +//[Order(2)] +//[Display(Name = "JIS业务")] +//public class JISModule : BaseModule +//{ +//} + +//[Order(1)] +//[Module] +//[Display(Name = "数据输入")] +//public class JISDataInputAttribute : GroupAttribute +//{ +//} + +//[Order(2)] +//[Module] +//[Display(Name = "数据输出")] +//public class JISDataOutputAttribute : GroupAttribute +//{ +//} + +//[Order(1)] +// +//[Display(Name = "HBPO结算导入")] +//public class Class9 : BaseEntity +//{ +//} + +//[Order(2)] +// +//[Display(Name = "BBAC结算导入")] +//public class Class10 : BaseEntity +//{ +//} + +//[Order(3)] +// +//[Display(Name = "HBPO发运数据")] +//public class Class11 : BaseEntity +//{ +//} + +//[Order(4)] +// +//[Display(Name = "BBAC发运数据")] +//public class Class12 : BaseEntity +//{ +//} + +//[Order(1)] +//[JISDataOutput] +//[Display(Name = "HBPO结算核对明细输出")] +//public class Class13 : BaseEntity +//{ +//} + +//[Order(2)] +//[JISDataOutput] +//[Display(Name = "BBAC结算核对明细输出")] +//public class Class14 : BaseEntity +//{ +//} + +//[Order(3)] +//[JISDataOutput] +//[Display(Name = "HBPO无法出库明细与汇总输出")] +//public class Class15 : BaseEntity +//{ +//} + +//[Order(4)] +//[JISDataOutput] +//[Display(Name = "BBAC无法出库明细与汇总输出")] +//public class Class16 : BaseEntity +//{ +//} + +//[Order(5)] +//[JISDataOutput] +//[Display(Name = "HBPO结算发货明细与汇总")] +//public class Class17 : BaseEntity +//{ +//} + +//[Order(6)] +//[JISDataOutput] +//[Display(Name = "BBAC结算发货明细与汇总")] +//public class Class18 : BaseEntity +//{ +//} + +///// + +//[Order(3)] +//[Display(Name = "JIT业务")] +//public class JITModule : BaseModule +//{ +//} + +//[Order(1)] +//[Module] +//[Display(Name = "数据输入")] +//public class JITDataInputAttribute : GroupAttribute +//{ +//} + +//[Order(2)] +//[Module] +//[Display(Name = "数据输出")] +//public class JITDataOutputAttribute : GroupAttribute +//{ +//} + +//[Order(1)] +//[JITDataInput] +//[Display(Name = "JIT件结算导入")] +//public class Class19 : BaseEntity +//{ +//} +//IResource +//[Order(2)] +//[JITDataInput] +//[Display(Name = "JIT发运数据查询")] +//public class Class20 : BaseEntity +//{ +//} + +//[Order(1)] +//[JITDataOutput] +//[Display(Name = "JIT件结算核对明细输出")] +//public class Class21 : BaseEntity +//{ +//} + +//[Order(2)] +//[JITDataOutput] +//[Display(Name = "JIT件寄售库不能出库明细与汇总")] +//public class Class22 : BaseEntity +//{ +//} + +//[Order(3)] +//[JITDataOutput] +//[Display(Name = "JIT件结算发货明细与汇总")] +//public class Class23 : BaseEntity +//{ +//} + +///// + +//[Order(4)] +//[Display(Name = "备件业务")] +//public class BeiJianModule : BaseModule +//{ +//} + +//[Order(1)] +//[Module] +//[Display(Name = "数据输入")] +//public class BeiJianDataInputAttribute : GroupAttribute +//{ +//} + +//[Order(2)] +//[Module] +//[Display(Name = "数据输出")] +//public class BeiJianDataOutputAttribute : GroupAttribute +//{ +//} + +//[Order(1)] +//[BeiJianDataInput] +//[Display(Name = "备件结算导入")] +//public class Class24 : BaseEntity +//{ +//} + +//[Order(2)] +//[BeiJianDataInput] +//[Display(Name = "备件发运数据查询")] +//public class Class25 : BaseEntity +//{ +//} + +//[Order(1)] +//[BeiJianDataOutput] +//[Display(Name = "备件结算核对明细输出")] +//public class Class26 : BaseEntity +//{ +//} + +//[Order(2)] +//[BeiJianDataOutput] +//[Display(Name = "备件寄售库不能出库明细与汇总输出")] +//public class Class27 : BaseEntity +//{ +//} + +//[Order(3)] +//[BeiJianDataOutput] +//[Display(Name = "备件有结算有发货明细与汇总输出")] +//public class Class28 : BaseEntity +//{ +//} + +//[Order(4)] +//[BeiJianDataOutput] +//[Display(Name = "备件有结算无发货明细与汇总输出")] +//public class Class29 : BaseEntity +//{ +//} + +///// + +//[Order(5)] +//[Display(Name = "备件业务")] +//public class MaiDanJianModule : BaseModule +//{ +//} + +//[Order(1)] +//[Module] +//[Display(Name = "数据输入")] +//public class MaiDanJianDataInputAttribute : GroupAttribute +//{ +//} + +//[Order(2)] +//[Module] +//[Display(Name = "数据输出")] +//public class MaiDanJianDataOutputAttribute : GroupAttribute +//{ +//} + +//[Order(1)] +// +//[Display(Name = "印度件结算导入")] +//public class Class30 : BaseEntity +//{ +//} + +//[Order(2)] +// +//[Display(Name = "印度件发运数据查询")] +//public class Class31 : BaseEntity +//{ +//} + +//[Order(1)] +//[MaiDanJianDataOutput] +//[Display(Name = "印度件结算核对明细输出")] +//public class Class32 : BaseEntity +//{ +//} + +//[Order(2)] +//[MaiDanJianDataOutput] +//[Display(Name = "印度件寄售库不能出库明细与汇总输出")] +//public class Class33 : BaseEntity +//{ +//} + +//[Order(3)] +//[MaiDanJianDataOutput] +//[Display(Name = "印度件有结算有发货明细与汇总输出")] +//public class Class34 : BaseEntity +//{ +//} + +//[Order(4)] +//[MaiDanJianDataOutput] +//[Display(Name = "印度件有结算无发货明细与汇总输出")] +//public class Class35 : BaseEntity +//{ +//} + +////// +//[Order(6)] +//[Display(Name = "出库单")] +//public class ChuKuDanGroup : GroupAttribute +//{ +//} + +//[Order(1)] +//[ChuKuDanGroup] +//[Display(Name = "HBPO-JIS出库单")] +//public class Class36 : BaseEntity +//{ +//} + +//[Order(2)] +//[ChuKuDanGroup] +//[Display(Name = "BBAC-JIS出库单")] +//public class Class37 : BaseEntity +//{ +//} + +//[Order(3)] +//[ChuKuDanGroup] +//[Display(Name = "JIT件件出库单")] +//public class Class38 : BaseEntity +//{ +//} + +//[Order(4)] +//[ChuKuDanGroup] +//[Display(Name = "备件出库单")] +//public class Class39 : BaseEntity +//{ +//} + +//[Order(5)] +//[ChuKuDanGroup] +//[Display(Name = "印度件出库单")] +//public class Class40 : BaseEntity +//{ +//} + +//[Order(6)] +//[ChuKuDanGroup] +//[Display(Name = "不能出库记录出库业务")] +//public class Class41 : BaseEntity +//{ +//} + +////// +//[Order(7)] +//[Display(Name = "商务审核")] +//public class ShangWuShenHeGroup : GroupAttribute +//{ +//} + +//[Order(1)] +//[ShangWuShenHeGroup] +//[Display(Name = "HBPO-JIS 商务待开票")] +//public class Class42 : BaseEntity +//{ +//} + +//[Order(2)] +//[ShangWuShenHeGroup] +//[Display(Name = "BBAC-JIS商务待开票")] +//public class Class43 : BaseEntity +//{ +//} + +//[Order(3)] +//[ShangWuShenHeGroup] +//[Display(Name = "JIT件商务发票待开票")] +//public class Class44 : BaseEntity +//{ +//} + +//[Order(4)] +//[ShangWuShenHeGroup] +//[Display(Name = "备件商务发票待开票")] +//public class Class45 : BaseEntity +//{ +//} + +//[Order(5)] +//[ShangWuShenHeGroup] +//[Display(Name = "印度件商务发票待开票")] +//public class Class46 : BaseEntity +//{ +//} + +////// +//[Order(7)] +//[Display(Name = "财务审核")] +//public class CaiWuShenHeGroup : GroupAttribute +//{ +//} + +//[Order(1)] +//[CaiWuShenHeGroup] +//[Display(Name = " BBAC-JIS财务管理审核")] +//public class Class47 : BaseEntity +//{ +//} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/MaterialRelationship.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/MaterialRelationship.cs new file mode 100644 index 00000000..571554b5 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/MaterialRelationship.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + + +[Display(Name = "客户零件关系")] +public class MaterialRelationship +{ +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs new file mode 100644 index 00000000..3259bf50 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs @@ -0,0 +1,131 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "PUB可结算导入")] +public class PUB_CAN_SA :FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + + [Display(Name = "结算单据")] + public string BillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public int State { get; set; } + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; + + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } = null!; + + public PUB_CAN_SA(int version, string settleBillNum, string billNum, int state, string businessType, string invGroupNum) + { + Version = version; + SettleBillNum = settleBillNum; + BillNum = billNum; + State = state; + BusinessType = businessType; + InvGroupNum = invGroupNum; + } +} +[Display(Name = "PUB可结算导入明细")] +public class PUB_CAN_SA_DETAIL : SA_CAN_BASE +{ + //[Display(Name = "LU+ASN单号")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + + /// + /// 对应字段PartNumber + /// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段productionlumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 对应字段filename 区分 cn1、cn5 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Qty + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + ///// + ///// 对应字段ReceiveDate + ///// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; + + /// + /// 对应字段DeliveryNode + /// + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; + + public PUB_CAN_SA_DETAIL(string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string businessType, string groupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + BusinessType = businessType; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs new file mode 100644 index 00000000..69f8277a --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs @@ -0,0 +1,92 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "PUB不可结算导入明细")] +public class PUB_NOT_SA_DETAIL : SA_NOT_BASE +{ + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 期间 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string SettleBillNum { get; set; } = null!; + + /// + /// 对应字段Material + /// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 对应字段ExternalCalNumber + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + [Display(Name = "扩展1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展3")] + public string Extend3 { get; set; } = null!; + + //[Display(Name = "单价")] + //public decimal Price { get; set; } + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + /// + /// 对应字段PostingDate + /// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public PUB_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, string extend1, string extend2, string extend3, decimal price, string invGroupNum, DateTime settleDate, string businessType, string groupNum) + { + KeyCode = keyCode; + Version = version; + SettleBillNum = settleBillNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + Price = price; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + BusinessType = businessType; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD_DETAIL.cs new file mode 100644 index 00000000..849f1d0f --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD_DETAIL.cs @@ -0,0 +1,73 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "PUB待扣减实体")] +public class PUB_PD_DETAIL :PD_BASE +{ + //[Display(Name = "LU+ASN单号")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "替换零件号")] + //public string RELU { get; set; } = null!; + + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + //[Display(Name = "替换生产号")] + //public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; + + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public PUB_PD_DETAIL(string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string businessType, string invGroupNum, DateTime settleDate, string groupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + RELU = rELU; + PN = pN; + REPN = rEPN; + Site = site; + Qty = qty; + Price = price; + BusinessType = businessType; + InvGroupNum = invGroupNum; + SettleDate = settleDate; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs new file mode 100644 index 00000000..8d293541 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs @@ -0,0 +1,120 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "公用结算导入主表")] +public class PUB_SA : FullAuditedAggregateRoot +{ + [Display(Name = "期间")] + public int Version { get; set; } + + [Display(Name = "结算单据")] + public string BillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + public PUB_SA(int version, string billNum, string state) + { + Version = version; + BillNum = billNum; + State = state; + } +} +[Display(Name = "公用结算导入明细")] +public class PUB_SA_DETAIL:SA_BASE +{ + ///// + ///// 对应字段（Material+External Delivery ID） + ///// + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + ///// + ///// 版本号 + ///// + //[Display(Name = "期间")] + //public int Version { get; set; } + + ///// + ///// 结算单号 + ///// + //[Display(Name = "结算单号")] + //public string BillNum { get; set; } = null!; + + /// + /// 对应字段Material + /// + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + ///// + ///// 取值字段External Delivery ID + ///// + //[Display(Name = "生产码")] + //public string PN { get; set; } = null!; + + /// + /// + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + //[Display(Name = "结算数量")] + //public decimal Qty { get; set; } + + ///// + ///// 匹配价格表对应区间对应地点带出 + ///// + //[Display(Name = "单价")] + //public decimal Price { get; set; } + + + + ///// + ///// 对应字段PostingDate + ///// + //[Display(Name = "结算日期（收货日期)")] + //public DateTime SettleDate { get; set; } + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展字段3")] + public string Extend3 { get; set; } = null!; + + ///// + ///// 对应字段Reference + ///// + //[Display(Name = "结算分组")] + //public string GroupNum { get; set; } = null!; + + public PUB_SA_DETAIL(string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum) + { + KeyCode = keyCode; + Version = version; + BillNum = billNum; + LU = lU; + PN = pN; + Site = site; + Qty = qty; + Price = price; + + SettleDate = settleDate; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + GroupNum = groupNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs new file mode 100644 index 00000000..867f5a41 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs @@ -0,0 +1,66 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; + + + + +namespace SettleAccount.Domain.BQ; +[Display(Name = "PUB发运数据")] +public class PUB_SE_DETAIL :SE_BASE +{ + //[Display(Name = "LU+生产码")] + //public string KeyCode { get; set; } = null!; + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "零件号")] + //public string LU { get; set; } = null!; + + //[Display(Name = "ASN单号")] + //public string PN { get; set; } = null!; + + //[Display(Name = "发货数量")] + //public decimal Qty { get; set; } + + [Display(Name = "扩展1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展3")] + public string Extend3 { get; set; } = null!; + + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; + + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } + + //[Display(Name = "发货时间")] + //public DateTime ShippingDate { get; set; } + + //[Display(Name = "Wms发货单号")] + //public string WmsBillNum { get; set; } = null!; + + public PUB_SE_DETAIL(string keyCode, int version, string lU, string pN, decimal qty, string extend1, string extend2, string extend3, string businessType, DateTime beginDate, DateTime shippingDate, string wmsBillNum) + { + KeyCode = keyCode; + Version = version; + LU = lU; + PN = pN; + Qty = qty; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + BusinessType = businessType; + BeginDate = beginDate; + ShippingDate = shippingDate; + WmsBillNum = wmsBillNum; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs new file mode 100644 index 00000000..03638929 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PURCHASE_PRICE.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "采购价格单")] + +public class PURCHASE_PRICE +{ +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_BJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_BJ.cs new file mode 100644 index 00000000..31a5ab33 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_BJ.cs @@ -0,0 +1,36 @@ +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + + +[Display(Name = "备件价格表")] + +public class TB_PRICE_BJ +{ + /// + /// 取值字段【零件号】 + /// + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 取值字段【零件价格】 + /// + [Display(Name = "价格")] + public decimal Price { get; set; } + + /// + /// 取值字段【客户编码】 + /// + [Display(Name = "客户编码")] + public string ClientCode { get; set; } = null!; + + public TB_PRICE_BJ(string lU, decimal price, string clientCode) + { + LU = lU; + Price = price; + ClientCode = clientCode; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_LIST.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_LIST.cs new file mode 100644 index 00000000..fca6789e --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_PRICE_LIST.cs @@ -0,0 +1,52 @@ +using System; +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + +[Display(Name = "销售价格单")] +public class TB_PRICE_LIST +{ + /// + /// 取值字段Part No. + /// + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 取值字段Total Price + /// + [Display(Name = "价格")] + public decimal Price { get; set; } + + /// + /// 取值字段Valid From + /// + [Display(Name = "开始时间")] + public DateTime BeginTime { get; set; } + + /// + /// 取值字段Valid To + /// + [Display(Name = "结束时间")] + public DateTime EndTime { get; set; } + + /// + /// 取值字段Plant取值字段1040=BBAC奔驰亦庄，1046=BBAC奔驰顺义，104T=HBPO + /// + [Display(Name = "客户编码")] + public string ClientCode { get; set; } = null!; + [Display(Name = "业务列别")] + public string BusinessType { get; set; } = null!; + + public TB_PRICE_LIST(string lU, decimal price, DateTime beginTime, DateTime endTime, string clientCode, string businessType) + { + LU = lU; + Price = price; + BeginTime = beginTime; + EndTime = endTime; + ClientCode = clientCode; + BusinessType = businessType; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs new file mode 100644 index 00000000..53e58ea5 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/TB_RePartsRelationship.cs @@ -0,0 +1,35 @@ +using System.ComponentModel.DataAnnotations; + + + +namespace SettleAccount.Domain.BQ; + + +[Display(Name = "客户替换件关系")] +public class TB_RePartsRelationship +{ + /// + /// 取值字段【零件号】 + /// + [Display(Name = "零件号")] + public string LU { set; get; } = null!; + + /// + /// 取值字段【替换零件号】 + /// + [Display(Name = "替换零件号")] + public string RepLU { set; get; } = null!; + + [Display(Name = "客户编码")] + public string ClientCode { set; get; } = null!; + [Display(Name = "业务类型")] + public string BusinessType { set; get; } = null!; + + public TB_RePartsRelationship(string lU, string repLU, string clientCode, string businessType) + { + LU = lU; + RepLU = repLU; + ClientCode = clientCode; + BusinessType = businessType; + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/ISettleAccountBranchEfCoreRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/ISettleAccountBranchEfCoreRepository.cs index ddc476d9..d1a8a9e5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/ISettleAccountBranchEfCoreRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/ISettleAccountBranchEfCoreRepository.cs @@ -32,7 +32,7 @@ namespace Win.Sfs.SettleAccount public interface ISettleAccountBQEfCoreRepository : IWinEfCoreRepository - , ITransientDependency + , ITransientDependency where TEntity : class, IEntity { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj index 6a137a39..225e6f9c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj @@ -1,4 +1,4 @@ - +