Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

5 天以前 76746dcdb6f0572c4b3349056421369aa7a34b09

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue

@@ -79,7 +79,6 @@
                  props.lastList.push(list.value[i].data[j])
            }
          }
          console.log(props)
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")

 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue

@@ -110,7 +110,6 @@
              }
            }
          }
          console.log(props)
        } else {
          ElMessage.warning(res.msg)
        }

 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">{{ 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/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue

@@ -218,6 +218,7 @@
  })
}
const printOrder = (type) => {
  printNumber()
  const list = tag.value.value
  list.panels[0].printElements.forEach(element => {
    element.options.fontFamily = 'Arial'
@@ -848,7 +849,7 @@
const printNumber = () => {

  selectRecordsData.value.printList = selectRecords
  request.post(`/processCard/updatePrintNumber`, selectRecordsData.value).then((res) => {
  request.post(`/tagStyle/updatePrintNumber`, selectRecordsData.value).then((res) => {
    if (res.code == 200 && res.data === true) {
    } else {

@@ -967,7 +968,7 @@
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
        <el-button v-print="printContent" :icon="Printer" circle />
      </template>
      <print-process
          id="child"
@@ -1004,7 +1005,7 @@
        destroy-on-close
        style="width: 80%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
        <el-button v-print="printContentLabelSemi" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-custom-label-semi id="childLabelSemi"
                               :faceOrientation="labelRow.faceOrientation"

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -899,7 +899,10 @@
    }
  }
}

const brokenGridKey = ref(0)
const openedBrokenTable = async () => {
  brokenGridKey.value++
  await nextTick()
  console.log('breakageType:', titleSelectJson.value.breakageType)
  console.log('breakageReason:', titleSelectJson.value.breakageReason)
@@ -1893,7 +1896,7 @@
          +brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
          style="width: 80%;height:75% ">
        <vxe-grid

            :key="brokenGridKey"
            height="400px"
            ref="brokenGrid"
            class="mytable-scrollbar"

 north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java

@@ -54,7 +54,7 @@
    @ExcelProperty("订单类型")
    private String orderType;
    @ExcelProperty("在制品厚度")
    private String thicknessSum;
    private Double thicknessSum;
    @ExcelProperty("平方毫米")
    private String thicknessArea;
    private Double thicknessArea;
}

 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

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -1840,7 +1840,7 @@
        </if>
        HAVING 1 = 1
        <if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
            AND thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
            and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
        </if>
        ORDER BY
        t.this_process,
@@ -2106,7 +2106,7 @@
        ) x
        WHERE 1 = 1
        <if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
            AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
            and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
        </if>
        <if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
            AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
@@ -2875,7 +2875,7 @@
        ) x
        WHERE 1 = 1
        <if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
            AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
            and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
        </if>
        <if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
            AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}