Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-03 60059736395d7f0efe7bfffe5e186001d7b157b4

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -372,7 +372,7 @@
        deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
        deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
        pleaseCheckTheRequiredData:'Please check the required data',

        landingSequence:'Landing sequence',
        labelStyle:'Label Style',
        customLabelPrinting:'Custom label printing',
        labelPrinting:'Label printing',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -372,6 +372,7 @@
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，检查下工序是否已报工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
        customLabelPrinting:'自定义标签打印',

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -222,20 +222,38 @@
  },
  data: [],//table body实际数据
  //脚部求和

  weighAllAmount(data) {
    let count = 0
    data.forEach(row => {
      count += row.weight
    })
    return count
  },
  footerMethod ({ columns, data }) {//页脚函数
    let count = 0

    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["baiscQuantity",'computeGrossArea','weight','perimeter']

        const List = ["baiscQuantity",'computeGrossArea']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        if (column.field === 'weight'){
          data.forEach(row => {
            count += weightSum(row)
          })
          return  parseFloat(count.toFixed(2))
        }

        return ''
      })
    ]
  }
  },

})

@@ -289,7 +307,7 @@
    },
    {
      field: 'landingSequence',
      title: '落架顺序',
      title: t('processCard.landingSequence'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -325,7 +343,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'goodsQuantity','area','perimeter']
        const List = ["quantity",'goodsQuantity','area']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -284,7 +284,10 @@
              id += selectRecords[i].id + "|"
            }
          }
          router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})

          let printMergeVal=printMerge.value.split('').join(',')
          console.log(printMergeVal)
         router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})

          break
        }

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue

@@ -38,7 +38,7 @@
          if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

            produceList.value.forEach(item => {
              item.detail[0].technologyNumber = printMerge;
              item.detail[0].technologyNumber = printMerge.split(',').join('');
            });
          }
          const s01Values = [];
@@ -256,7 +256,7 @@
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
          <label>{{ parseFloat(itemsum.gross_area, 2) }}</label>
          <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
          重量：
          <label>{{ itemsum.weight }}</label>
        </td>

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

@@ -211,7 +211,7 @@
    showStatus: true
  },
  menuConfig: {
    body: {
    /*body: {
      options: [
        [
          {
@@ -237,7 +237,7 @@
          },
        ]
      ]
    }
    }*/
  },
  //表头参数
  columns: [
@@ -651,7 +651,7 @@
  addListener(brokenGrid.value,brokenGridOptions)
  let damage =ref(brokenRow.value.damageDetails)
  brokenGrid.value.reloadData(damage.value)
  addListener(xGrid.value, gridOptions)
  //addListener(xGrid.value, gridOptions)
}


@@ -1126,7 +1126,7 @@
}
onMounted(() => {
  window.addEventListener('keypress', qrcodeScanner);
  addListener(xGrid.value, gridOptions)
 // addListener(xGrid.value, gridOptions)
})

// 在组件卸载时移除键盘事件监听

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

@@ -483,7 +483,7 @@
               fc.process_id,
               SUM(od.quantity)                                as quantity,
               round(SUM(ogd.total_area), 2)                   as gross_area,
               SUM(od.weight)                                  as weight,
               round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2)                   as weight,
               #{technologyNumber}                             as technologyNumber,
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
        from flow_card as fc
@@ -492,6 +492,7 @@
                              fc.technology_number = ogd.technology_number
                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                 left join sd.`order` as o on o.order_id = fc.order_id
                 left join sd.product as p on p.id=od.product_id
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by fc.process_id, fc.technology_number