diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index b07bffff..ebdfdecd 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -4,9 +4,9 @@ }, "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13326;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True", - "SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", + //"SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", - //"SettleAccountService": "Server=10.60.101.83;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", + "SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", "ExChangeCenterService": "Server=dev.ccwin-in.com,13326;Database=ExChangeCenter;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", "WMSBJBMPT": "Server=dev.ccwin-in.com,6208;Database=WMS_BJBMPT_2;User ID=sa;Password=ChangkeTec@2021;Trusted_Connection=False;TrustServerCertificate=True;", diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 56213eb1..46d1ae2c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs @@ -508,6 +508,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ && inv.State!=SettleBillState.已提交QAD && inv.State!=SettleBillState.财务已审核 && inv.State != SettleBillState.客户已收票 + && inv.State != SettleBillState.红冲发票 ) { throw new UserFriendlyException($"发票只有在财务已审核、红冲状态下可以报废!", "400"); @@ -670,6 +671,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ && inv.State != SettleBillState.已提交QAD && inv.State != SettleBillState.财务已审核 && inv.State != SettleBillState.客户已收票 + && inv.State != SettleBillState.红冲发票 ) { throw new UserFriendlyException($"发票只有在财务已审核、红冲状态下可以报废!", "400"); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs index a2768605..5a3c4e27 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs @@ -496,6 +496,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ && inv.State != SettleBillState.已提交QAD && inv.State != SettleBillState.财务已审核 && inv.State != SettleBillState.客户已收票 + && inv.State != SettleBillState.红冲发票 ) { throw new UserFriendlyException($"发票只有在财务已审核、红冲状态下可以报废!", "400"); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index d7d77ef9..cb23e530 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -556,6 +556,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ Customer = customer }; + invoiceSyncQad.SetId(teaTaskSub.TaskID); + + await _settleAccountDbContext.BulkInsertAsync(new List() { invoiceSyncQad }); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index 67f7c6e5..f8fda684 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs @@ -658,6 +658,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ && inv.State != SettleBillState.已提交QAD && inv.State != SettleBillState.财务已审核 && inv.State != SettleBillState.客户已收票 + && inv.State != SettleBillState.红冲发票 ) { throw new UserFriendlyException($"发票只有在财务已审核、红冲状态下可以报废!", "400"); @@ -898,6 +899,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ && inv.State != SettleBillState.已提交QAD && inv.State != SettleBillState.财务已审核 && inv.State != SettleBillState.客户已收票 + && inv.State != SettleBillState.红冲发票 ) { throw new UserFriendlyException($"发票只有在财务已审核、红冲状态下可以报废!", "400");