diff --git a/base-ui/src/api/kucun/wholesale.js b/base-ui/src/api/kucun/wholesale.js index e69de29b..42673201 100644 --- a/base-ui/src/api/kucun/wholesale.js +++ b/base-ui/src/api/kucun/wholesale.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 条件查询 +export function exportExcel(data) { + return request({ + url: '/kucun/kchz', + method: 'get', + data: data + }) +} \ No newline at end of file diff --git a/base-ui/src/views/kucun/pfsjgl/index.vue b/base-ui/src/views/kucun/pfsjgl/index.vue index 96cfa5ba..5103e76e 100644 --- a/base-ui/src/views/kucun/pfsjgl/index.vue +++ b/base-ui/src/views/kucun/pfsjgl/index.vue @@ -7,21 +7,10 @@ {{ searchxianshitit }}
- - - - - + + 至 - - - - - - - - 至 - +
@@ -77,6 +66,44 @@
+ + +
+ + 选取文件 + 上传到服务器 +
上传 《汇融银行_配送中心批发数据.xlsx》文件
+ +
+
+

文件上传结果

+ +
共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }} 条；用时：{{ currentLog.durations }} 毫秒。
+ +
+
+

库存汇总数据

+ +
{{ hzResultMesssage }}
+
+ 下载汇总文件 + 下载烟草汇总文件 +
+ +
+ + 关 闭 + @@ -101,16 +128,9 @@ export default { { type: 'primary', size: 'small', - icon: 'plus', + icon: 'upload', btnKey: 'toAdd', - btnLabel: '新增' - }, - { - type: 'danger', - size: 'small', - icon: 'del', - btnKey: 'doDel', - btnLabel: '删除' + btnLabel: '上传批发数据' }, { type: 'info', @@ -127,17 +147,15 @@ export default { size: 10, total: 0, params: { - code: '', - buyerName: '', - purchaseStartDate: '', - purchaseEndDate: '', - supplierName: '', - purchasingDeptName: '', - arrivalStartDate: '', - arrivalEndDate: '', - completionStatusKey: '' + orderDateStart: '', + orderDateEnd: '' } }, + dialogVisible: false, + updateAction: process.env.VUE_APP_BASE_API + '/wholesale/uploadPszxpfsj', + fileList: [], + currentLog: {}, + fullscreenloading: null, name: '批发数据管理' } }, @@ -173,8 +191,7 @@ export default { break } }, - handleSelectionChange(row) { - }, + handleSelectionChange(row) {}, dosearch() { this.queryParams.current = 1 this.loadList() @@ -185,23 +202,55 @@ export default { size: 10, total: 0, params: { - code: '', - buyerName: '', - purchaseDateStart: '', - purchaseDateEnd: '', - supplierName: '', - purchasingDeptName: '', - arrivalDateStart: '', - arrivalDateEnd: '', - completionStatusKey: '' + orderDateStart: '', + orderDateEnd: '' } } this.loadList() }, loadList() {}, + toAdd() { + this.dialogVisible = true + }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) + }, + dialogClose() {}, + submitUpload() { + this.$refs.upload.submit() + }, + handleProgress(event, file, fileList) { + const _this = this + this.fullscreenloading = this.$loading({ + lock: true, + text: '文件正在上传', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + if (event.percent >= 100) { + _this.fullscreenloading.text = '上传完成，正在导入数据库' + } + }, + handleSuccess(resp, file, fileList) { + const _this = this + _this.fullscreenloading.text = '数据导入完成，进行数据整理' + _this.currentLog = resp.data + + kchz() + .then(res => { + if (this.fullscreenloading) this.fullscreenloading.close() + this.fullscreenloading = null + console.log('333', res) + _this.hzFilePath = res.data + }) + .catch(e => { + if (this.fullscreenloading) this.fullscreenloading.close() + this.fullscreenloading = null + }) + }, + doDownloadHz() { + window.open(this.hzFilePath, '_blank') } } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleLogService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleLogService.java index da781a01..19f3517e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleLogService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleLogService.java @@ -1,8 +1,33 @@ package com.yxt.supervise.portal.biz.gdwholesale; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorage; +import com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery; import org.springframework.stereotype.Service; @Service public class GdWholesaleLogService extends ServiceImpl { + + public PagerVo listPageVo(PagerQuery pq) { + + GdWholesaleQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StrUtil.isNotBlank(query.getOrderDateStart())){ + qw.ge("dataDate",query.getOrderDateStart()); + } + if(StrUtil.isNotBlank(query.getOrderDateEnd())){ + qw.lt("dataDate",query.getOrderDateEnd()); + } + qw.orderByDesc("dataDate"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleQuery.java new file mode 100644 index 00000000..beec0b03 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleQuery.java @@ -0,0 +1,10 @@ +package com.yxt.supervise.portal.biz.gdwholesale; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class GdWholesaleQuery implements Query { + private String orderDateStart; + private String orderDateEnd; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleRest.java index 5a62caf2..9c83674e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleRest.java @@ -1,11 +1,12 @@ package com.yxt.supervise.portal.biz.gdwholesale; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorage; +import com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @RestController("com.yxt.supervise.portal.biz.gdwholesale.GdWholesaleRest") @@ -14,6 +15,8 @@ public class GdWholesaleRest { @Autowired private GdWholesaleService gdWholesaleService; + @Autowired + private GdWholesaleLogService gdWholesaleLogService; /** @@ -25,4 +28,16 @@ public class GdWholesaleRest { public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { return gdWholesaleService.uploadAndInsert(file); } + + @PostMapping("/logsPagerList") + public ResultBean> logsPagerList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = gdWholesaleLogService.listPageVo(pq); + return rb.success().setData(pv); + } + + @GetMapping("/buildExcel/logId") + public ResultBean buildExcel() { + return gdWholesaleService.buildExcel(); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleService.java index 70494227..b1025707 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdwholesale/GdWholesaleService.java @@ -120,4 +120,9 @@ public class GdWholesaleService extends ServiceImpl buildExcel() { + + return null; + } }