From 084767df2ca39b57fb057c15b8b760d11598291d Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 4 Jan 2022 17:33:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/SettleSparePartDapperReportRepository.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs index 6d0f90ab..377f8c0f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs @@ -31,6 +31,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "FROM\n" + " (\n" + " SELECT\n" + + " c.LineNumber,--行号\n" + " c.Period AS WMSDeliveryDate,--交货日期\n" + " c.WMSDeliveryNote,--交货单号\n" + " c.SpareDate AS OrderDate,--订单日期\n" + @@ -109,6 +110,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report //[ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)] public class SettleSparePartExport { + [ExporterHeader(DisplayName = "行号")] + public string LineNumber { set; get; } + [ExporterHeader(DisplayName = "交货日期")] public string WMSDeliveryDate { set; get; } From 48d49eeeb008f670d239217c84d855e87339ee16 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 4 Jan 2022 17:36:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/basedata.js | 11 +- vue/src/router/modules/vw_menu.js | 11 +- vue/src/router/modules/vw_out_order.js | 10 + .../ux/billManage/IssuedUnsettled/index.vue | 19 +- .../ux/billManage/kanBanWithOutCode/index.vue | 1357 +++++++++++++++++ .../kanbanWithOutOrder/detail.vue} | 517 ++++--- .../billManage/kanbanWithOutOrder/index.vue | 340 +++++ .../views/ux/billManage/sparePart/index.vue | 331 ++-- 8 files changed, 2197 insertions(+), 399 deletions(-) create mode 100644 vue/src/views/ux/billManage/kanBanWithOutCode/index.vue rename vue/src/views/ux/{basedata/partsSettlement/index.vue => billManage/kanbanWithOutOrder/detail.vue} (52%) create mode 100644 vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js index 7709d2af..7bfd5e53 100644 --- a/vue/src/router/modules/basedata.js +++ b/vue/src/router/modules/basedata.js @@ -38,16 +38,7 @@ const basedataRouter = { name: 'codeSetting',//命名路由 meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' } }, - { - path: 'part-settlement', - component: () => import('@/views/ux/basedata/partsSettlement/index'), - name: 'partsSettlement',//命名路由 - meta: { - title: '总成与结算件关系', - roles: ['SettleAccount.MaterialRelationships'], - icon: '零件' - } - }, + { path: 'priceList', component: () => import('@/views/ux/basedata/priceList/index'), diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 5d8e00ed..08f50acf 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -157,7 +157,16 @@ const vwMenudataRouter = { icon: '看板' } }, - + { + path: '/kbwithoutcode', + component: () => import('@/views/ux/billManage/kanBanWithOutCode'), + name: 'KanBanWithOutCode',//命名路由 + meta: { + title: '无条码看板结算输出', + //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色(可以设置多个角色) + icon: '看板' + } + }, { path: '/vwsparepart', component: () => import('@/views/ux/billManage/sparePart'), diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js index cedb4e3a..7f23c247 100644 --- a/vue/src/router/modules/vw_out_order.js +++ b/vue/src/router/modules/vw_out_order.js @@ -36,6 +36,16 @@ const vwOutOrderDataRouter = { icon: '结算' } }, + { + path: 'kanban-without-order', + component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众无条码看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, { path: 'sparepart-out-order', component: () => import('@/views/ux/billManage/sparepartOutOrder/index'), diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index f8831cac..7b1db815 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -1,4 +1,4 @@ - +