Browse Source

解决bug,服务端、客户端

HQ
刘云峰 3 months ago
parent
commit
318fbd8d23
  1. 3
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportNoteAppService.cs
  2. 12
      src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json
  3. 4
      vue/src/router/modules/fis.js
  4. 4
      vue/src/router/modules/fisprint.js
  5. 4
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  6. 2
      vue/src/views/pg-fis/basedate/planControl/index.vue
  7. 4
      vue/src/views/pg-fis/basedate/planControl_V2/index.vue
  8. 4
      vue/src/views/pg-fis/basedate/select/index.vue

3
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; //导入文件时 总装上线时间 为空,使用 涂装下线时间 代替 总装上线时间

12
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;"
},

4
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: '客户零件'
}

4
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: '结算对比'
}

4
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,
});

2
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"
/>
</el-form-item>

4
vue/src/views/pg-fis/basedate/planControl_V2/index.vue

@ -7,7 +7,7 @@
<el-form-item label="底盘号" prop="vin">
<el-input v-model="listQuery.vin" clearable size="small" style="width: 120px" />
<el-input v-model="listQuery.vin" clearable size="small" style="width: 200px" />
</el-form-item>
<el-form-item label="车型代码" prop="vehicleModelCode">
@ -225,7 +225,7 @@
}, //
{
label: "车型",
prop: "ehicleModel",
prop: "vehicleModel",
width: 120
}, //new
{

4
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,
});

Loading…
Cancel
Save