批发数据导入，接口

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
+  })
+}

base-ui/src/views/kucun/pfsjgl/index.vue

@@ -7,21 +7,10 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="queryParams" :inline="true" :model="queryParams" class="tab-header">
-              <el-form-item label="审核状态"><el-input v-model="queryParams.params.createSid" placeholder="" clearable /></el-form-item>
-              <el-form-item label="订单编号"><el-input v-model="queryParams.params.modifySid" placeholder="" clearable /></el-form-item>
-              <el-form-item label="填单人"><el-input v-model="queryParams.params.buyerName" placeholder="" clearable /></el-form-item>
-              <el-form-item label="填单日期">
-                <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
+              <el-form-item label="数据日期">
+                <el-date-picker v-model="queryParams.params.orderDateStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-              </el-form-item>
-              <el-form-item label="供应商名称"><el-input v-model="queryParams.params.contacts" placeholder="" clearable /></el-form-item>
-              <el-form-item label="要货单位"><el-input v-model="queryParams.params.telephone" placeholder="" clearable /></el-form-item>
-
-              <el-form-item label="到货日期">
-                <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-                <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
+                <el-date-picker v-model="queryParams.params.orderDateEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -77,6 +66,44 @@
         </div>
       </div>
     </div>
+    <el-dialog title="上传<汇融银行_配送中心批发数据>" :visible.sync="dialogVisible" width="60%" :before-close="dialogClose">
+      <el-card class="box-card">
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            :action="updateAction"
+            :on-progress="handleProgress"
+            :on-success="handleSuccess"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+            <div slot="tip" class="el-upload__tip">上传 《汇融银行_配送中心批发数据.xlsx》文件</div>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }}  条；用时：{{ currentLog.durations }}  毫秒。</div>
+          </el-card>
+        </div>
+        <div>
+          <h3>库存汇总数据</h3>
+          <el-card class="box-card">
+            <div>{{ hzResultMesssage }}</div>
+            <div>
+              <el-button :disabled="!hzFilePath" size="small" type="primary" @click="doDownloadHz">下载汇总文件</el-button>
+              <el-button :disabled="!ychzFilePath" size="small" type="primary" @click="doDownloadHzYc">下载烟草汇总文件</el-button>
+            </div>
+          </el-card>
+        </div>
+      </el-card>
+      <span slot="footer" class="dialog-footer"><el-button @click="dialogVisible = false">关 闭</el-button></span>
+    </el-dialog>
   </div>
 </template>
 
@@ -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')
     }
   }
 }

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<GdWholesaleLogMapper,GdWholesaleLog> {
+
+    public PagerVo<GdWholesaleLog> listPageVo(PagerQuery<GdWholesaleQuery> pq) {
+
+        GdWholesaleQuery query = pq.getParams();
+        QueryWrapper<GdWholesaleLog> 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<GdWholesaleLog> page = PagerUtil.queryToPage(pq);
+        IPage<GdWholesaleLog> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<GdWholesaleLog> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

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;
+}

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<GdWholesaleLog> uploadGdData(@RequestParam("file") MultipartFile file) {
         return gdWholesaleService.uploadAndInsert(file);
     }
+
+    @PostMapping("/logsPagerList")
+    public ResultBean<PagerVo<GdWholesaleLog>> logsPagerList(@RequestBody PagerQuery<GdWholesaleQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdWholesaleLog> pv = gdWholesaleLogService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @GetMapping("/buildExcel/logId")
+    public ResultBean<GdWholesaleLog> buildExcel() {
+        return gdWholesaleService.buildExcel();
+    }
 }

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<GdWholesaleMapper, GdWholesa
     public void clearByDataDate(String dataDate) {
         baseMapper.clearByDataDate(dataDate);
     }
+
+    public ResultBean<GdWholesaleLog> buildExcel() {
+
+        return null;
+    }
 }