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

guoyujie

2025-10-20 d878bcd48999cbb187b2e7c3a4ceb454630790bc

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

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

@@ -473,6 +473,17 @@
    }
  },
  {
    tid: 'stockPolysId', title: '版号/序号', data: '', type: 'text',
    options: {
      field: 'stockPolysId',
      testData: '',
      height: 16,
      fontSize: 11.25,
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: 'remarks', title: '订单备注', data: '', type: 'text',
    options: {
      field: 'remarks',

 north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue

@@ -261,7 +261,7 @@
  },
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList = ['inventory','quantityAvailable','area']
    let footList = ['inventory','quantityAvailable','area','computeGrossArea']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {

 north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue

@@ -709,11 +709,11 @@
          <div class="card-header">
            <span style="font-weight: bold">成品合计</span>
            &nbsp;&nbsp;&nbsp;
            <span>面积：{{ bomSum.sumData[0].area }}㎡</span>
            <span>面积：{{ bomSum.sumData[0].area.toFixed(2) }}㎡</span>
            &nbsp;&nbsp;&nbsp;
            <span>数量：{{ bomSum.sumData[0].quantity }}</span>
            &nbsp;&nbsp;&nbsp;
            <span>周长：{{ bomSum.sumData[0].perimeter }}m</span>
            <span>周长：{{ bomSum.sumData[0].perimeter.toFixed(2) }}m</span>
          </div>
        </template>


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

@@ -2822,6 +2822,7 @@
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
                              ogd.technology_number = fc.technology_number

        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
        group by fc.process_id,od.order_number, width, height
@@ -3056,7 +3057,8 @@
            '文本' as custom3,
            '文本' as custom4,
            '文本' as custom5,
            od.quantity
            od.quantity,
            CONCAT(opt.stock_id,"/",opt.polys_id) as stockPolysId
        from optimize_detail as opt
            left join optimize_layout as opl on opl.project_no=opt.project_no and opl.stock_id=opt.stock_id
                 left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number