From cae46147081dc77d135e1776531fd989ec75d015 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 22 Nov 2023 08:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintTable/Dtos/WaitPrintDto.cs | 2 +- .../PrintTable/WaitPrintAppService.cs | 21 +++++++++++++++++-- .../appsettings.json | 10 ++++++--- .../appsettings.json | 10 ++++++--- .../appsettings.json | 10 ++++++--- vue/src/router/index.js | 8 +++---- .../basedate/m100Online/normalPritIndex.vue | 3 ++- vue/static/config.js | 2 +- 8 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs index 64c47a1..4389b64 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/WaitPrintDto.cs @@ -146,7 +146,7 @@ namespace WY.NewJit.PrintTable /// [ExporterHeader(DisplayName = "R100上线时间")] [ImporterHeader(Name = "R100上线时间")] - public DateTime R100OnlineTime { get; set; } + public DateTime? R100OnlineTime { get; set; } /// /// R100接收时间 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs index 2e4f841..a5b0fe7 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs @@ -110,6 +110,8 @@ namespace WY.NewJit.PrintTable private readonly M100DomainService _m100DomainService; + private readonly IRepository _billR100Repository; + /// /// BLOB存储 /// @@ -133,8 +135,8 @@ namespace WY.NewJit.PrintTable IRepository zhuHuBanPackingListRepository, IRepository printTemplateConfigurationRepository, M100DomainService m100DomainService, - IBlobContainer blobContainer - + IBlobContainer blobContainer, + IRepository billR100Repository ) { _waitPrintRepository = waitPrintRepository; @@ -154,6 +156,7 @@ namespace WY.NewJit.PrintTable _printTemplateConfigurationRepository = printTemplateConfigurationRepository; _m100DomainService = m100DomainService; _blobContainer = blobContainer; + _billR100Repository = billR100Repository; } #region 私有方法 @@ -782,6 +785,20 @@ namespace WY.NewJit.PrintTable || input.BusinessType == BusinessTypeEnum.AC_ZhuHuBan) { ret = await QueryByConditionAsync(input, (PagedAndSortedBase)input); + + var knrLst = ret.Items.Select(itm => itm.KNR).ToList(); + + List r100Lst = await _billR100Repository.Where(itm => knrLst.Contains(itm.KNR)).ToListAsync(); + //List r100Lst = await _billR100Repository.GetListAsync(itm => knrLst.Contains(itm.KNR)); + foreach (var waitPrintItem in ret.Items) + { + BillR100 r100Obj = r100Lst.FirstOrDefault(itm => itm.KNR == waitPrintItem.KNR); + if (r100Obj != null) + { + waitPrintItem.R100OnlineTime = r100Obj.OnlineTime; + waitPrintItem.R100ReceiveTime = r100Obj.ReceiveTime; + } + } } //else if (input.BusinessType == BusinessTypeEnum.OtherZhuHuBan || input.BusinessType == BusinessTypeEnum.ZhuHuBan) //{ diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json index 60ad75e..a96bbb3 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json @@ -19,9 +19,13 @@ //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;", //"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;", //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" - "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", - "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + "Default": "Server=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + }, diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json index b34677b..3d23489 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json @@ -37,9 +37,13 @@ //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;", //"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;", //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" - "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", - "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + "Default": "Server=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + }, "AuthServer": { diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json index 3b914c4..57fed70 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json @@ -17,9 +17,13 @@ //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;", //"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;", //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" - "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", - "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + "Default": "Server=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;", + "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + }, diff --git a/vue/src/router/index.js b/vue/src/router/index.js index a3122ab..7753e71 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -64,10 +64,10 @@ export const constantRoutes = [ }, { path: '/login', - component: () => import('@/views/login/index'), - //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one - //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one - //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), + //component: () => import('@/views/login/index'), + //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one + //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one + component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), hidden: true }, { diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 7753f73..54a56e7 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -369,6 +369,7 @@ size="small" style="width: 240px" @change="beginHostSNChange" + :disabled="true" />