From c6a17e48e48d3ad264a361c34388e7ae254911ed Mon Sep 17 00:00:00 2001 From: lzh Date: Sun, 8 Jan 2023 23:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-ui/src/api/kucun/ruku.js | 12 ++ base-ui/src/views/kucun/rkmx/index.vue | 20 ++- base-ui/src/views/kucun/xssjgl/index.vue | 2 +- .../gdinstorage/GdInstorageCountMapper.java | 30 ++++ .../gdinstorage/GdInstorageCountMapper.xml | 17 +++ .../gdinstorage/GdInstorageCountService.java | 144 ++++++++++++++++++ .../biz/gdinstorage/GdInstorageRest.java | 9 ++ .../portal/biz/gdsales/GdSalesService.java | 58 ++++++- .../PurchaseRequisitionRest.java | 55 ++++--- .../在途商品汇总统计表.xlsx | Bin 0 -> 20707 bytes .../xlsx-tmpl/销售汇总日报表.xlsx | Bin 0 -> 26237 bytes 11 files changed, 319 insertions(+), 28 deletions(-) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx diff --git a/base-ui/src/api/kucun/ruku.js b/base-ui/src/api/kucun/ruku.js index ead9b620..3908b9a5 100644 --- a/base-ui/src/api/kucun/ruku.js +++ b/base-ui/src/api/kucun/ruku.js @@ -74,3 +74,15 @@ export function jmdRkmxListDownload(data) { } }) } + +// 下采购订单、入库的数据 +export function ztsjZhengli() { + return request({ + url: '/v1/purchaserequisition/supplierAnalysis', + method: 'post' + }) +} + +export function buildExcelZaiTu() { + return request({ url: '/ruku/buildExcelZaiTu' }) +} diff --git a/base-ui/src/views/kucun/rkmx/index.vue b/base-ui/src/views/kucun/rkmx/index.vue index ef30a758..cacc5751 100644 --- a/base-ui/src/views/kucun/rkmx/index.vue +++ b/base-ui/src/views/kucun/rkmx/index.vue @@ -114,6 +114,7 @@
入库单上传 + 下载在途数据 重新统计入库信息
@@ -146,7 +147,7 @@