From 318fbd8d23ca5bff6a045b08d2c6354b61378887 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 5 Mar 2025 15:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=8C=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E3=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EdiReceive/ImportNoteAppService.cs | 3 +++ .../WY.NewJit.Job.ConsoleSyncToWms/appsettings.json | 12 ++++++------ vue/src/router/modules/fis.js | 4 ++-- vue/src/router/modules/fisprint.js | 4 ++-- .../pg-fis/basedate/m100Online/normalPritIndex.vue | 4 ++-- vue/src/views/pg-fis/basedate/planControl/index.vue | 2 +- .../views/pg-fis/basedate/planControl_V2/index.vue | 4 ++-- vue/src/views/pg-fis/basedate/select/index.vue | 4 ++-- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportNoteAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportNoteAppService.cs index 476ed22..ae032b0 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportNoteAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportNoteAppService.cs @@ -505,6 +505,9 @@ namespace WY.NewJit.EdiReceive foreach (var tar in tarLst) { tar.CreateTime = ServerHelper.CurrentDateTime; + tar.CreatePerson = CurrentUser.UserName; + tar.ImportTime = ServerHelper.CurrentDateTime; + tar.ImportPerson = CurrentUser.UserName; if (tar.OnlineTime == null) { tar.OnlineTime = tar.PaintOfflineTime; //导入文件时 总装上线时间 为空，使用 涂装下线时间 代替 总装上线时间 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 be42a0c..81fcf3d 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 @@ -20,12 +20,12 @@ //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;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_HQ_Temp;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;" - "Default": "Server=192.168.0.228;Database=NewJitPG_HQ;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;" + //"Default": "Server=192.168.1.228;Database=NewJitPG_HQ_Temp;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=192.168.1.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + "Default": "Server=192.168.1.228;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;", + "ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + "WMS": "Server=192.168.1.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" }, diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js index 4a1a858..c818091 100644 --- a/vue/src/router/modules/fis.js +++ b/vue/src/router/modules/fis.js @@ -21,7 +21,7 @@ const pgfis = { component: () => import('@/views/pg-fis/basedate/planControl/index.vue'), name: 'pg-planControl',//命名路由 meta: { - title: '计划管理（E001车型）', + title: 'E001计划管理', //roles: ['SettleAccount.Reports'], icon: '客户零件' } @@ -31,7 +31,7 @@ const pgfis = { component: () => import('@/views/pg-fis/basedate/planControl_V2/index.vue'), name: 'pg-planControl_V2', //命名路由 meta: { - title: '计划管理（D077-E007车型）', + title: 'D077-E007计划管理', //roles: ['SettleAccount.Reports'], icon: '客户零件' } diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js index ac79e23..37f7cfc 100644 --- a/vue/src/router/modules/fisprint.js +++ b/vue/src/router/modules/fisprint.js @@ -21,7 +21,7 @@ const pgfisPrint = { component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), name: 'pg-M100Online',//命名路由 meta: { - title: '日常打印E001信息', + title: '日常打印信息', //roles: ['SettleAccount.Reports'], icon: '客户零件' } @@ -31,7 +31,7 @@ const pgfisPrint = { component: () => import('@/views/pg-fis/basedate/select'), name: 'select',//命名路由 meta: { - title: 'E001查询', + title: 'M100查询', //roles: ['SettleAccount.Reports'], icon: '结算对比' } diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 89e9bc6..bd78a57 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -709,12 +709,12 @@ export default { width: 150, }); tempsTabs.push({ - label: "E001上线时间", + label: "上线时间", prop: "onlineTime", width: 150, }); tempsTabs.push({ - label: "E001接收时间", + label: "接收时间", prop: "receiveTime", width: 180, }); diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue index a9bcf1a..9ba204a 100644 --- a/vue/src/views/pg-fis/basedate/planControl/index.vue +++ b/vue/src/views/pg-fis/basedate/planControl/index.vue @@ -22,7 +22,7 @@ v-model="listQuery.vin" clearable size="small" - style="width: 120px" + style="width: 200px" /> diff --git a/vue/src/views/pg-fis/basedate/planControl_V2/index.vue b/vue/src/views/pg-fis/basedate/planControl_V2/index.vue index db628a1..dd3044f 100644 --- a/vue/src/views/pg-fis/basedate/planControl_V2/index.vue +++ b/vue/src/views/pg-fis/basedate/planControl_V2/index.vue @@ -7,7 +7,7 @@ - + @@ -225,7 +225,7 @@ }, //规格说明 { label: "车型", - prop: "ehicleModel", + prop: "vehicleModel", width: 120 }, //new { diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue index 2f939fd..84acd2e 100644 --- a/vue/src/views/pg-fis/basedate/select/index.vue +++ b/vue/src/views/pg-fis/basedate/select/index.vue @@ -634,12 +634,12 @@ export default { width: 150, }); tempsTabs.push({ - label: "E001上线时间", + label: "上线时间", prop: "onlineTime", width: 150, }); tempsTabs.push({ - label: "E001接收时间", + label: "接收时间", prop: "receiveTime", width: 180, });