Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/views/system/supplies/index.vue

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

 import request from '@/utils/request'
 
+
+//小物料转大物料
+export function materialConvert(data) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
+    method: 'post',
+    data: data
+  })
+}
 // 查询Excel模板列表
 export function listSuppliesTemplate(query) {
   return request({

ruoyi-ui/src/views/system/supplies/index.vue

@@ -255,7 +255,7 @@ export default {
             });
             return
           }
-          roleListid(id).then(response => {
+          /*roleListid(id).then(response => {
             var sysRules = JSON.parse(response.rows[0].detailContent);
 
             for (var i = 0; i < sysRules.length; i++) {
@@ -280,7 +280,130 @@ export default {
             }
             // 切换到原页面
              luckysheet.setSheetActive(0);
-          })
+          })*/
+          //将luckyExcel的celldata文件转为data文件
+          var data=window.luckysheet.transToData(exportJson.sheets[0].celldata);
+          let map=new Map();
+
+          let key_i;
+          let value_1;
+          let value_2;
+          let value_3;
+          for(let i=0;i<data[0].length;i++){
+            if(data[1][i].v=='类别名称'){
+              key_i=i;
+            }
+            if(data[1][i].v=='实出数量'){
+              value_1=i;
+            }
+            if(data[1][i].v=='不含税单价'){
+              value_2=i;
+            }
+            if(data[1][i].v=='含税金额'){
+              value_3=i;
+              break;
+            }
+          }
+          debugger
+          let smallMat=[];
+          for(let i=2;i<data.length;i++){
+            if(data[i][key_i]!=null){
+              let num=data[i][key_i].m;
+              smallMat.push(num);
+            }else{
+              smallMat.push(null);
+            }
+          }
+            console.log(smallMat);
+          materialConvert(smallMat).then(response => {
+            debugger
+            let array = response.rows;
+          });
+          /*window.luckysheet.setCellValue(2,5,{
+                "fa": "0.00",
+                "t": "g"
+            })*/
+          //luckysheet.setCellValue(12, 1, {bg:"#FF0000"})
+          for (let i = 2; i < data.length; i++) {
+            if(data[i][key_i]!=null){
+              let a =parseFloat(data[i][value_1].v);
+              let b =parseFloat(data[i][value_2].v);
+              let c =data[i][value_3].v;
+              let values=[a,b,c];
+              if(map.has(data[i][key_i].v)){
+                let oldValues=map.get(data[i][key_i].v);
+                values[0]=parseFloat(parseFloat(values[0]+oldValues[0]).toFixed(2));
+                values[1]=parseFloat(parseFloat(values[1]+oldValues[1]).toFixed(6));
+                values[2]=parseFloat(parseFloat(values[2]+oldValues[2]).toFixed(2));
+                map.set(data[i][key_i].v,values);
+              }else{
+                map.set(data[i][key_i].v,values);
+              }
+            }else{
+              break;
+            }
+          }
+          //循环得到汇总结果
+          console.log(map);
+          value_1=luckysheet.find("实出数量")[0].column;
+          value_2= luckysheet.find("不含税单价")[0].column;
+          value_3 =luckysheet.find("含税金额")[0].column;
+          var rowws;
+          map.forEach((value, key) => {
+            rowws=luckysheet.find(key)[0].row;
+            luckysheet.setCellValue(rowws, value_1,value[0]);
+            luckysheet.setCellValue(rowws, value_2,value[1]);
+            luckysheet.setCellValue(rowws, value_3,value[2]);
+          });
+          debugger
+          console.log(rowws);
+          debugger
+          //切换到想要的sheet
+          luckysheet.setSheetActive(0);
+          //返回单元格第二行的数据
+          let celn=luckysheet.getcellvalue(1);
+
+
+          // //返回当前工作表第1列数据
+          // let r1,r2,r3,r4,r5,r6;
+          // let cown=luckysheet.getcellvalue(null,0);
+          // for(let i=0;i<cown.length;i++){
+          //   if(cown[i].m==maps[0]){
+          //     r1=i;
+          //   }
+          //   if(cown[i].m==maps[1]){
+          //     r2=i;
+          //   }
+          //   if(cown[i].m==maps[2]){
+          //     r3=i;
+          //   }
+          //   if(cown[i].m==maps[3]){
+          //     r4=i;
+          //   }
+          //   if(cown[i].m==maps[4]){
+          //     r5=i;
+          //   }
+          //   if(cown[i].m==maps[5]){
+          //     r6=i;
+          //     break;
+          //   }
+          // }
+          // //将值放到指定位置
+          // let rowss=[];
+          // let valus=map.get(maps[0]);
+          // luckysheet.setCellValue(r1, value_1,valus[0]);
+          // luckysheet.setCellValue(r1, value_2,valus[0]);
+          // luckysheet.setCellValue(r1, value_3,valus[0]);
+          // for(let i=0;i<cown.length;i++){
+          //
+          //     for(let j=0;j<maps.length;j++){
+          //       if(cown[i].m==maps[j]){
+          //         rowss.push(i);
+          //         break;
+          //       }
+          //     }}
+          // debugger
+          // console.log(rowss);
         })