chenlu
8 天以前 0a1dfd480189581e7f10e3c2ce3149d2cc9d6ece
流程卡字体配置
2个文件已修改
22 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -168,7 +168,17 @@
      //每个序号面积
      collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
      totalArea = add(totalArea, collection.total_area)
      totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
      //根据有几层计算重量
      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;
        }else {
          totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
        }
      }
      //每个序号周长
      collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
    });
@@ -359,7 +369,9 @@
      <td class="tdNowrap">单片名称:</td>
      <td colspan="3">{{ itemTr.glass_child }}</td>
      <td class="tdNowrap">产品名称:</td>
      <td :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
      <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
      <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
    </tr>
    <tr>
      <td rowspan='2'>序号</td>
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -808,7 +808,8 @@
               pd.separation,
               fc.technology_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
               od.building_number
               od.building_number,
               od.weight
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -3559,7 +3560,8 @@
        pd.separation,
        #{compound} as technology_number,
        IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
        od.building_number
        od.building_number,
        od.weight
        from flow_card as fc
        left join sd.order_glass_detail as ogd
        on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and