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

chenlu

2025-08-11 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5

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

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -200,7 +200,7 @@
                </div>
              </div>
              <div style="display:flex;">
                <div style="width: 100%"><span style="font-weight: bold">工程名称</span>：{{page[0].customer.project}}</div>
                <div style="width: 100%"><span style="font-weight: bold">工程名称</span>：{{page[0].customer.project}}({{page[0].customer.batch}})</div>
              </div>
              <div style="display:flex;">
                <div style="width: 50%"><span style="font-weight: bold">订单号</span>：{{page[0].customer.order_id}}</div>
@@ -338,16 +338,16 @@

@media print {
  @page {
    size: auto;  /* auto is the initial value */
    size: B5;  /* auto is the initial value */
    margin: 4mm 5mm 0mm 5mm  /* this affects the margin in the printer settings */

  }
  .pages{
    height: 95%;
    height: 94vh;
  }
  #footsum{
    position: absolute;
    bottom: 1cm;
    bottom: 0cm;
    width: 100%; /* 或者设置成具体的宽度 */
  }
  #sticky-footer {

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -883,6 +883,7 @@
        select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select  o.order_id,
                                                                             o.customer_name,
                                                                             o.project,
                                                                             o.batch,
                                                                             fol.remarks,
                                                                             SUM(fol.quantity) as quantity,
                                                                             ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,