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

廖井涛

2024-07-01 965609cd0f82ff4cc1aa06711ed174fc95a5b333

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

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

@@ -37,7 +37,8 @@
  contacts:'order.contacts',
  deliveryAddress:'order.deliveryAddress',
  processingNote:'order.processingNote',
  remarks:'product.msg.remarks'
  remarks:'product.msg.remarks',
  customerAbbreviation:'customer.customerAbbreviation'

})


 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue

@@ -155,7 +155,7 @@
          <th>规格（宽W*高H）</th>
          <th>片数</th>
          <th>面积</th>
          <th>延米</th>
          <th>{{company.columnNamePerimeter}}</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>备注</th>
@@ -193,21 +193,21 @@
        </tr>

        <tr>
          <td colspan="4">小计</td>
          <td colspan="5">小计</td>
          <td>{{getQuantity(item.productDetail)}}</td>
          <td>{{getArea(item.productDetail)}}</td>
          <td>{{getPerimeter(item.productDetail)}}</td>
          <td colspan="6"></td>
          <td colspan="7"></td>
        </tr>


      </tbody>
        <tr>
          <td colspan="4">总计</td>
          <td colspan="5">总计</td>
          <td>{{grossNum.quantity}}</td>
          <td>{{grossNum.grossArea}}</td>
          <td>{{grossNum.perimeter}}</td>
          <td colspan="8"></td>
          <td colspan="7"></td>
        </tr>
        <tr>
          <td colspan="15" style="white-space: pre-wrap;text-align:left ">

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue

@@ -137,7 +137,7 @@
          <th>规格（宽W*高H）</th>
          <th>片数</th>
          <th>面积</th>
          <th>延米</th>
          <th>{{company.columnNamePerimeter}}</th>
          <th>半径</th>
          <th>楼号</th>
          <th>加工要求</th>
@@ -222,7 +222,7 @@
        <td>{{grossNum.quantity}}</td>
        <td>{{grossNum.grossArea}}</td>
        <td>{{grossNum.perimeter}}</td>
        <td colspan=""></td>
        <td colspan="9"></td>
      </tr>
      <tr>
        <td colspan="17" style="white-space: pre-wrap;text-align:left ">

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

@@ -424,11 +424,9 @@
    //改变brokenVisible的值触发openedBrokenTable（）方法
    const { rows, column, cell } = params; // 解构获取行、列和单元格信息
    //点击次破数量时打开明细界面
    if(column.title=="次破数量"){
    if(column.field=="breakageQuantity"){
      brokenVisible.value = true
    }


  },
  menuClick({menu, row, column}) {
    const $grid = xGrid.value

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

@@ -636,7 +636,7 @@
        select o.order_id           as orderId,
               project,
               customer_id          as customerId,
               customer_name        as customerName,
               o.customer_name        as customerName,
               order_type           as orderType,
               order_classify       as orderClassify,
               batch,
@@ -658,13 +658,14 @@
               od.building_number   as buildingNumber,
               od.product_name      as productName,
               od.edging_type       as edgingType,
               p.remarks

               p.remarks,
               c.customer_abbreviation as customerAbbreviation
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join flow_card as fc on o.order_id = fc.order_id and
                                              od.order_number = fc.order_number
                 left join sd.product as p on p.id=od.product_id
                 left join sd.customer as c on c.id = o.customer_id
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by od.order_number, width, height