no message

wms-vue/src/components/duochaxun/JianHuoBiaoDan.vue

@@ -209,7 +209,7 @@ export default {
         const xlsxParam = { raw: true }
         const wb = XLSX.utils.table_to_book(document.querySelector('#educe-table'), xlsxParam)
         // 导出excel文件名
-        let fileName = '拣货表单_' + new Date().getTime() + '.xlsx'
+        let fileName = '拣货表单数据_' + new Date().getTime() + '.xlsx'
 
         const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
         try {

wms-vue/src/components/duochaxun/JianHuoXiaoLv.vue

@@ -78,7 +78,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNum"
-        :page-sizes="[ 50, 100, 200,500]"
+        :page-sizes="[ 50, 100, 200,500,10000]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
@@ -92,6 +92,8 @@ import FileSaver from 'file-saver'
 // eslint-disable-next-line no-unused-vars
 import XLSX from 'xlsx'
 export default {
+  // eslint-disable-next-line vue/multi-word-component-names
+  name:"拣货任务效率统计",
   data() {
     return {
       pickerOptions: {
@@ -239,7 +241,9 @@ export default {
       pageSize: 50
       ,spanArr: [], //每行合并数
       pos: 0, //角标索引
+      // 当前页
       pageNum: 1,
+      // 总条数
       total: 3,
       param: {
         出库类型:'',
@@ -329,35 +333,23 @@ export default {
       this.queryUser();
     },
     down(){
-      this.exportToExcel();
+      this.downExcel();
     },
     // 表格数据写入excel，并导出为Excel文件
-    exportToExcel(){
+    downExcel(){
-      /*const worksheet = XLSX.utils.json_to_sheet(this.tableData);
+      //显示加载图
-      const workbook = XLSX.utils.book_new();
+      this.tableloding=true;
-      XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+      //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
-      XLSX.writeFile(workbook, 'table_data.xlsx');*/
+      //参数和搜索参数一样
-      const XLSX = require('xlsx')
+      this.$axios.post(this.$httpUrl + '/JianHuoXiaoLv/download', {
-      console.log('XLSX',XLSX,FileSaver)
+        pageSize: this.total,
-      // 使用 this.$nextTick 是在dom元素都渲染完成之后再执行
+        pageNum: 1,
-      this.$nextTick(function () {
+        param: this.param,
-        // 设置导出的内容是否只做解析，不进行格式转换     false：要解析， true:不解析
+      },{responseType:'blob'}).then(res => {
-        const xlsxParam = { raw: true }
+        this.tableloding=false;
-        const wb = XLSX.utils.table_to_book(document.querySelector('#educe-table'), xlsxParam)
+        //重命名文件
-        // 导出excel文件名
+        this.downloadFile(res.data,'拣货任务效率统计'+ '数据', 'xlsx')
-        let fileName = '拣货效率统计_' + new Date().getTime() + '.xlsx'
+      });
-
-        const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
-        try {
-          // 下载保存文件
-          FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), fileName)
-        } catch (e) {
-          if (typeof console !== 'undefined') {
-            console.log(e, wbout)
-          }
-        }
-        return wbout
-      })
     },
     KuS(){
       //库区下拉列表数据加载

wms-vue/src/components/duochaxun/Jianhuojiemian.vue

@@ -924,8 +924,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/Jianhuojiemian/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/components/duochaxun/Kucunhuizong.vue

@@ -838,8 +838,8 @@ export default {
     //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
     //参数和搜索参数一样
     this.$axios.post(this.$httpUrl + '/Kucunhuizong/download', {
-      pageSize: this.pageSize,
+      pageSize: this.total,
-      pageNum: this.pageNum,
+      pageNum: 1,
       param: this.param,
     },{responseType:'blob'}).then(res => {
       this.tableloding=false;

wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue

@@ -339,8 +339,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/dcx/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/components/duochaxun/Pandianmingxi.vue

@@ -595,8 +595,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/Pandianmingxi/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/components/duochaxun/Rukuzhengli.vue

@@ -564,8 +564,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/Rukuzhengli/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/components/duochaxun/Xuliehao.vue

@@ -585,8 +585,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/Xuliehaoqingdan/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/components/duochaxun/Zhengliqingdan.vue

@@ -733,8 +733,8 @@ export default {
       //发起请求：/Jianhuojiemian/download，请求方式为post，类型为 {responseType:'blob'}
       //参数和搜索参数一样
       this.$axios.post(this.$httpUrl + '/Zhengliqingdan/download', {
-        pageSize: this.pageSize,
+        pageSize: this.total,
-        pageNum: this.pageNum,
+        pageNum: 1,
         param: this.param,
       },{responseType:'blob'}).then(res => {
         this.tableloding=false;

wms-vue/src/main.js

@@ -8,9 +8,9 @@ import VueRouter from "vue-router";
 import router from "@/router/router";
 import store from "@/store/store";
 Vue.prototype.$axios=axios;
-//Vue.prototype.$httpUrl='http://127.0.0.1:8083';
+Vue.prototype.$httpUrl='http://127.0.0.1:8083';
 //Vue.prototype.$httpUrl='http://192.68.2.88:8081';
-Vue.prototype.$httpUrl='http://10.1.112.23:8083';
+// Vue.prototype.$httpUrl='http://10.1.112.23:8083';
 Vue.config.productionTip = false;
 Vue.use(VueRouter)
 Vue.use(ElementUI,{size:'small'});

wms/src/main/java/com/yc/wms/controller/JianHuoXiaoLvController.java

@@ -6,11 +6,13 @@ import com.yc.wms.bean.Xuliehao;
 import com.yc.wms.service.Xuliehaoqingdan;
 import com.yc.wms.until.QueryPageUtil;
 import com.yc.wms.until.Result;
+import com.yc.wms.utils.FileUtil;
 import com.yc.wms.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +32,8 @@ public class JianHuoXiaoLvController {
     @PersistenceContext
     private EntityManager entityManager;
     @Autowired
+    private NamedParameterJdbcTemplate jdbcTemplate;
+    @Autowired
     private Xuliehaoqingdan xuliehaoqingdan;
 
     private static /* 基础sql数据查询*/
@@ -93,8 +97,15 @@ public class JianHuoXiaoLvController {
         String sqlCount = "select count(t.id) as nums from (" + sqlFa+") t";
         List<Integer> counts = entityManager.createNativeQuery(sqlCount).getResultList();
         /* 查询所有数据*/
-        List<JhXl> jhXlList = entityManager.createNativeQuery(sqlFy, JhXl.class).getResultList();
+        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
-        Result result=Result.result(200,"操作成功",Long.parseLong(counts.get(0).toString()), jhXlList);
+        for (int i = 0; i < maps.size(); i++) {
+            Map<String,Object> map=maps.get(i);
+            map.put("mergeData",new HashMap() {{
+                put("单据类型", new int[]{1, 1});
+            }});
+        }
+//        List<JhXl> jhXlList = entityManager.createNativeQuery(sqlFy, JhXl.class).getResultList();
+        Result result=Result.result(200,"操作成功",Long.parseLong(counts.get(0).toString()), maps);
 
         return result;
     }
@@ -112,18 +123,35 @@ public class JianHuoXiaoLvController {
     }
     @PostMapping(value = "/download")
     public void exportCompany(HttpServletResponse response, @RequestBody String  json) throws Exception {
-
+        download( (List<Map<String,Object>>)queryList(json).getData(), response);
-        QueryPageUtil query =new QueryPageUtil();
+    }
-        JSONObject jsonObject= JSONUtil.parseObj(json);
+    public void download(List<Map<String, Object>> all, HttpServletResponse response) throws Exception {
-        query.setPageSize((int)jsonObject.get("pageSize"));
+        List<Map<String, Object>> list = new ArrayList<>();
-        query.setPageNum((int)jsonObject.get("pageNum"));
+        for (Map<String,Object> company : all) {
-
+            Map<String, Object> map = new LinkedHashMap<>();
-        JSONObject param= (JSONObject)jsonObject.get("param");
+            map.put("单据类型", company.get("单据类型"));
-
+            map.put("出库类型", company.get("出库类型"));
-        Xuliehao j = JSONUtil.toBean(param.toString(), Xuliehao.class);
+            map.put("任务号", company.get("任务号"));
-
+            map.put("子任务号", company.get("子任务号"));
-
+            map.put("库区", company.get("库区"));
-        xuliehaoqingdan.download( (List<Map<String,Object>>)xuliehaoqingdan.QueryJson(query,j).getData(), response);
+            map.put("拣货行", company.get("拣货行"));
+            map.put("创建时间", company.get("创建时间"));
+            map.put("生成合单任务时间", company.get("生成合单任务时间"));
+            map.put("下发时间", company.get("下发时间"));
+            map.put("拣货时间", company.get("拣货时间"));
+            map.put("清点时间", company.get("清点时间"));
+            map.put("合单时间", company.get("合单时间"));
+            map.put("交单时间", company.get("交单时间"));
+            map.put("创建-下发时间", company.get("创建-下发时间"));
+            map.put("下发-拣货时间", company.get("下发-拣货时间"));
+            map.put("拣货-合单时间", company.get("拣货-合单时间"));
+            map.put("合单-交单时间", company.get("合单-交单时间"));
+            map.put("拣货-清点时间", company.get("拣货-清点时间"));
+            map.put("清点-合单时间", company.get("清点-合单时间"));
+            map.put("拣货-交单时间", company.get("拣货-交单时间"));
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list, response);
     }
 }
 @Data

wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java

@@ -235,7 +235,7 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
             map.put("预入库日期", company.get("DELIVERY_DATE"));
             map.put("预入库操作人", company.get("RELATED_BILL5"));
             map.put("备注", company.get("description"));
-            if(company.get("PROP_C1").equals("0")){
+            if(company.get("BE_QUALITY").equals("0")){
                 map.put("是否质检", "否");
             }else{
                 map.put("是否质检", "是");

wms/src/main/resources/application.yml

@@ -12,13 +12,13 @@ server:
 
 spring:
   datasource:
-    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
+#    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
-     #url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest
+    url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
-    username: wmsdb
+#    username: wmsdb
-    password: AmecDDbb32A
+#    password: AmecDDbb32A
-     #username: WMSDB
+    username: WMSDB
-     #password: WmsYc@5688
+    password: WmsYc@5688
 
     hikari:
       connection-timeout: 60000