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

guoyuji

2024-07-12 f4e8f069d050293232cfe68ebd38b2b05c4ad4b4

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

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

@@ -175,10 +175,18 @@
  height: 25px;
  font-weight: bold;
  font-size: 15pt;
  margin-left: 40px;
}
.row1 span{
  font-size: 15pt;
}

.row2 span{
  font-size: 15pt;
}

.row5 span{
  font-size: 10pt;
  font-size: 15pt;
}

.row6 {

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

@@ -174,6 +174,12 @@
  font-weight: bold;
  font-size: 12pt;
}
.row1 span {
  font-size: 10pt;
}
.row2 span {
  font-size: 10pt;
}
.row5 span {
  font-size: 10pt;
}

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

@@ -113,8 +113,9 @@
        <span>{{item.project}}</span>&nbsp;
        <span>{{ item.building_number }}</span>
      </div>
      <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-else-if="item.bend_radius!=null">{{item.width}}*{{item.height}}=R/{{item.bend_radius}}</div>
      <div class="row3" v-else>{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
@@ -177,7 +178,7 @@
  font-size: 12pt;
}
.row5 span {
  font-size: 10pt;
  font-size: 12pt;
}

.row6 {

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

@@ -135,8 +135,9 @@
          <span v-else></span>
        </div>

        <div class="row3" v-if="item.other_columns==null||(JSON.parse(item.other_columns).S02==null)">{{item.width}}*{{item.height}}={{item.quantity}}</div>
        <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row3" v-else-if="item.bend_radius!=null">{{item.width}}*{{item.height}}=R/{{item.bend_radius}}</div>
        <div class="row3" v-else>{{item.width}}*{{item.height}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>&nbsp;
          <span>{{ item.building_number }}</span>
@@ -199,7 +200,7 @@
.row3 {
  margin-top: -5px;
  height: 25px;
  font-size: 12pt;
  font-size: 15pt;
  font-weight: bolder;
}

@@ -219,7 +220,7 @@

@page {
  size: auto;  /* auto is the initial value */
  margin: 13mm 4mm 0mm 6mm  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 4mm  /* this affects the margin in the printer settings */

}


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

@@ -184,7 +184,7 @@

@page {
  size: auto;  /* auto is the initial value */
  margin: 13mm 4mm 0mm 6mm  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 4mm  /* this affects the margin in the printer settings */

}


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

@@ -587,14 +587,15 @@
               o.project,
               od.building_number,
               od.processing_note,
               od.width,
               od.height,
               ogd.child_width as width,
               ogd.child_height as height,
               ogd.glass_child,
               ogd.process,
               e.type_name,
               opd.stock_id,
               od.quantity,
               od.other_columns
               od.other_columns,
               od.bend_radius
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
@@ -612,8 +613,8 @@
        select o.order_id ,
               o.project,
               o.customer_id ,
               od.width,
               od.height,
               ogd.child_width as width,
               ogd.child_height as height,
               od.quantity,
               od.order_number as orderNumber,
               fc.technology_number as technologyNumber,
@@ -623,7 +624,8 @@
               ifnull(od.processing_note,'') as processing_note,
               bgt.type_name,
               od.other_columns,
               od.building_number
               od.building_number,
               od.bend_radius
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number