guoyujie
11 小时以前 9e7ce2b84facf7413f416cd2fb5261516d325c5d
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
2个文件已修改
11 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -170,13 +170,15 @@
      totalArea = add(totalArea, collection.total_area)
      //根据有几层计算重量
      for (let j = 0; j < produceList.value[i].detail.length; j++) {
        if (produceList.value[i].detail[j].technologyNumber.length>1){
          totalWeight += collection.weight * collection.quantity  * 1;
       let ceng = produceList.value[i].detail[j].technologyNumber.length
        if (produceList.value[i].processName!=""){
          for (let k = 0; k < produceList.value[i].detail[j].technologyNumber.length; k++) {
            totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
          }
        }else {
          totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
        }
      }
      //每个序号周长
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -464,6 +464,7 @@
                        }
                    }
                    itemmap.put("processName",processName);
                }