From a960fb0f441ff12a1cf39e0e6d85948b91e7fe62 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 22 Aug 2023 17:31:46 +0800 Subject: [PATCH] update --- .../wwwroot/components/list/index.js | 5 +++++ .../SettleAccount.HttpApi.Host/wwwroot/router/business.js | 6 ++++-- .../SettleAccount.Application/Entities/BQ/VmiAppService.cs | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js index b6b852fa..6b1b82d3 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js @@ -670,6 +670,11 @@ export default { if (route.meta.businessType) { formData.append("businessType", route.meta.businessType); } + if (route.meta.client === "bbac-104") { + formData.append("site", "104"); + } else if (route.meta.client === "bbac-1046") { + formData.append("site", "1046"); + } Object.keys(importModel.value).forEach((propertyName) => { if (importModel.value[propertyName]) { const schema = config.import.schema.properties[propertyName]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 9b91dcf7..e332f4a3 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -125,7 +125,8 @@ export default [ { ...createRoute("input", "title=数据输入"), children: [ - createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac", "JIS-BBAC 结算数据"), + createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac-104", "JIS-BBAC 结算数据"), + createInputJieSuanShuju("bbac_sa_service2", "JisBBAC", "bbac-1046", "JIS-BBAC顺义 结算数据"), createInputFaYunShuJu("bbac_se_detail_service", "JisBBAC", "bbac", "JIS-BBAC 发运数据"), createInputEdiShuJu("bbac_se_edi_service", "JisBBAC", "bbac", "JIS-BBAC EDI数据"), ], @@ -186,7 +187,8 @@ export default [ { ...createRoute("input", "title=数据输入"), children: [ - createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 结算数据"), + createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-104", "直供件-BBAC 结算数据"), + createInputJieSuanShuju("bbac_jit_pub_sa_service2", "ZhiGongJianBBAC", "bbac-1046", "JIS-BBAC顺义 结算数据"), createInputFaYunShuJu("bbac_jit_pub_se_detail_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 发运数据"), ], }, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index 089f72f0..f0b8602a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -160,7 +160,7 @@ public class VmiAppService : ApplicationService, IJobService, ITransientDependen using var transaction = db.Database.BeginTransaction(); try { - var time = DateTime.Now.ToString("yyyy_mm_dd_hh_mm_ss"); + var time = DateTime.Now.ToString("yyyy-MM-dd_HH:mm"); var table = $"Set_VmiBalance_{time}"; var snapshot = db.Set().Where(o => o.Name == table).FirstOrDefault(); if (snapshot == null)