From 6d57c1e75e76c74828d4f3d6dcf862c294d5ba46 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 25 Dec 2023 09:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/models/compare/vmi-job.js | 4 ++-- .../wwwroot/router/business.js | 22 +++++++++---------- .../ReportServices/ReportMakeService.cs | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/vmi-job.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/vmi-job.js index 9dcf98d3..9935f451 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/vmi-job.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/vmi-job.js @@ -84,10 +84,10 @@ export default function (businessType, type) { delete compareSchema.properties["downLineDateTime"]; if (businessType === "BBACDiff") { compareService = "report/get-bbacwms-edi-diff"; - name = "BBAC全表核对差异"; + name = "BBAC EDI与发运信息全量核对差异"; } else if (businessType === "HBPODiff") { compareService = "report/get-hbpowms-edi-diff"; - name = "HBPO全表核对差异"; + name = "HBPO EDI与发运信息全量核对差异"; } } else { // if (businessType === "JisBBAC") { 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 1802b795..f70bb647 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 @@ -63,7 +63,7 @@ function createCompareVmi(path, business, client, title = "库存余额任务") }; } -function createCompareDiff(path, business, client, title = "BBAC 全表核对差异") { +function createCompareDiff(path, business, client, title = "BBAC EDI与发运信息全量核对差异") { return { ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), component: "/compare/vmi", @@ -186,7 +186,7 @@ export default [ children: [ createCompareFaYun("bbac_sa_detail_jobservice", "JisBBAC", "bbac", "JIS-BBAC EDI与发运对比"), createCompareJieSuan("first_bbac_sa_detail_jobservice", "JisBBAC", "bbac", "JIS-BBAC EDI、发运与结算对比"), - createCompareDiff("bbacwms_edi_diff", "BBACDiff", "bbac", "BBAC 全表核对差异") + createCompareDiff("bbacwms_edi_diff", "BBACDiff", "bbac", "BBAC EDI与发运信息全量核对差异") ], }, { @@ -216,7 +216,7 @@ export default [ children: [ createCompareFaYun("hbpo_sa_detail_jobservice", "JisHBPO", "hbpo", "JIS-HBPO EDI与发运对比"), createCompareJieSuan("first_hbpo_sa_detail_jobservice", "JisHBPO", "hbpo", "JIS-HBPO EDI、发运与结算对比"), - createCompareDiff("hbpowms_edi_diff", "HBPODiff", "hbpo", "HBPO 全表核对差异") + createCompareDiff("hbpowms_edi_diff", "HBPODiff", "hbpo", "HBPO EDI与发运信息全量核对差异") ], }, { @@ -469,14 +469,14 @@ export default [ ...createPage("sum", "title=库存余额汇总"), children: [createButton("query", "title=查询&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")], }, - { - ...createPage("backup", "title=时点库存余额查询"), - children: [ - createButton("query", "title=查询&isTop=true"), - createButton("export", "title=导出&isTop=true&pattern=paged"), - createButton("invoke", "title=手动备份&isTop=true"), - ], - }, + // { + // ...createPage("backup", "title=时点库存余额查询"), + // children: [ + // createButton("query", "title=查询&isTop=true"), + // createButton("export", "title=导出&isTop=true&pattern=paged"), + // createButton("invoke", "title=手动备份&isTop=true"), + // ], + // }, { ...createPage("log", "title=库存事务查询"), path: "log", diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 3117a360..555a3d96 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -87,7 +87,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices List customConditionList = new List(); customConditionList.Add(new CustomCondition() { Name = "Year", Value = DateTime.Now.Year.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("BBAC全表核对差异", ExportExtentsion.Excel, DateTime.Now.Year.ToString(), string.Empty, CurrentUser, typeof(EdiWmsDiffService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("BBAC EDI与发运信息全量核对差异", ExportExtentsion.Excel, DateTime.Now.Year.ToString(), string.Empty, CurrentUser, typeof(EdiWmsDiffService), customConditionList, (rs) => { }).ConfigureAwait(false); @@ -109,7 +109,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices List customConditionList = new List(); customConditionList.Add(new CustomCondition() { Name = "Year", Value = DateTime.Now.Year.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("HBPO全表核对差异", ExportExtentsion.Excel, DateTime.Now.Year.ToString(), string.Empty, CurrentUser, typeof(HBPOEdiWmsDiffService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("HBPO EDI与发运信息全量核对差异", ExportExtentsion.Excel, DateTime.Now.Year.ToString(), string.Empty, CurrentUser, typeof(HBPOEdiWmsDiffService), customConditionList, (rs) => { }).ConfigureAwait(false);