diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index a910845a..c40095d8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -16,11 +16,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [AllowAnonymous] - [Route("api/settleaccount/bbac_can_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class BBAC_CAN_SA_SERVICE : ApplicationService, IBBAC_CAN_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); @@ -32,7 +32,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ throw new NotImplementedException(); } [HttpPost] - [Route("generateinvoice")] + //[Route("generateinvoice")] public Task GenerateInvoice(BBAC_CAN_SA_REQ_DTO input) { List _ls = new List(); @@ -86,7 +86,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - [Route("mainquery")] + //[Route("mainquery")] public Task> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs index 408cd05c..ffdb6fb8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs @@ -13,23 +13,23 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] - [Route("api/settleaccount/bbac_not_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class BBAC_NOT_SA_SERVICE : ApplicationService, IBBAC_NOT_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("export")] + //[Route("export")] public Task ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("generatesettlementorder")] + //[Route("generatesettlementorder")] public Task GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index 7ab07784..75a3932b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -13,29 +13,29 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] - [Route("api/settleaccount/hbpo_can_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class HBPO_CAN_SA_SERVICE : ApplicationService, IHBPO_CAN_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("export")] + //[Route("export")] public Task ExportAsync(HBPO_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("generateinvoice")] + //[Route("generateinvoice")] public Task GenerateInvoice(HBPO_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("mainquery")] + //[Route("mainquery")] public Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs index ff069c91..a6e7d9f9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs @@ -13,23 +13,23 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] - [Route("api/settleaccount/hbpo_not_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class HBPO_NOT_SA_SERVICE : ApplicationService, IHBPO_NOT_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("export")] + //[Route("export")] public Task ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input ) { throw new NotImplementedException(); } [HttpPost] - [Route("generatesettlementorder")] + //[Route("generatesettlementorder")] public Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index a8e0edd5..f82164e7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -13,29 +13,29 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] - [Route("api/settleaccount/pub_can_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class PUB_CAN_SA_SERVICE : ApplicationService, IPUB_CAN_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("export")] + //[Route("export")] public Task ExportAsync(PUB_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("generateInvoice")] + //[Route("generateInvoice")] public Task GenerateInvoice(PUB_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("mainquery")] + //[Route("mainquery")] public Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input) { throw new NotImplementedException(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs index 70713ae3..16e29a2e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs @@ -13,23 +13,23 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] - [Route("api/settleaccount/pub_not_sa_service")] + [Route("api/settleaccount/[controller]/[action]")] public class PUB_NOT_SA_SERVICE : ApplicationService, IPUB_NOT_SA_SERVICE { [HttpPost] - [Route("detailquery")] + //[Route("detailquery")] public Task> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("export")] + //[Route("export")] public Task ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); } [HttpPost] - [Route("generatesettlementorder")] + //[Route("generatesettlementorder")] public Task GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input) { throw new NotImplementedException(); 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 index d2aa822a..4cf50955 100644 --- 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 @@ -36,8 +36,10 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot [Display(Name = "订货时间")] public DateTime BeginDate { get; set; } - public string Extend1 { set; get; } + [Display(Name = "工厂")] + public string Site { get; set; } + public string Extend1 { set; get; } public string Extend2 { set; get; } public string Extend3 { set; get; } public string Extend4 { set; get; } @@ -45,7 +47,9 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot public BBAC_SE_EDI() { } - public BBAC_SE_EDI(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate) + public BBAC_SE_EDI(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate + + ,string site, string extend1, string extend2, string extend3, string extend4) { Id = guid; @@ -58,5 +62,12 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot InjectionCode = injectionCode; Qty = qty; BeginDate = beginDate; + Site = site; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + Extend4 = extend4; } + + } 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 index b492396a..ad1077f3 100644 --- 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 @@ -36,16 +36,20 @@ public class HBPO_SE_EDI :FullAuditedAggregateRoot [Display(Name = "订货时间")] public DateTime BeginDate { get; set; } + [Display(Name = "工厂")] + public string Site { get; set; } + + + public string Extend1 { set; get; } public string Extend2 { set; get; } public string Extend3 { set; get; } public string Extend4 { set; get; } - - public HBPO_SE_EDI(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate) + public HBPO_SE_EDI(Guid guid ,string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, string site, string extend1, string extend2, string extend3, string extend4) { - Id=guid; + Id = guid; KeyCode = keyCode; Version = version; LU = lU; @@ -55,8 +59,27 @@ public class HBPO_SE_EDI :FullAuditedAggregateRoot InjectionCode = injectionCode; Qty = qty; BeginDate = beginDate; + Site = site; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + Extend4 = extend4; } + //public HBPO_SE_EDI(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate) + //{ + // Id=guid; + // KeyCode = keyCode; + // Version = version; + // LU = lU; + // PN = pN; + // SeqNumber = seqNumber; + // AssemblyCode = assemblyCode; + // InjectionCode = injectionCode; + // Qty = qty; + // BeginDate = beginDate; + //} + public HBPO_SE_EDI() { }