流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度

chenlu

5 天以前 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d

流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度

 north-glass-erp/northglass-erp/public/config.js

@@ -11,4 +11,4 @@
//洛阳 172.17.2.7
//天津 192.168.150.39
//上海 10.153.18.3
//温州 192.168.2.7
//温州 192.168.2.7  1171bpue44086.vicp.fun:44934

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

@@ -326,7 +326,7 @@
        <div id="bj" v-else style="float: right;font-size: 28px"></div>
        <div>{{ company.companyName }}</div>
        <div>
          生产流程卡<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
          ({{itemFlow.order_type}})生产流程卡<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
          <span style="font-weight: bold" v-if="props.compound!=null">({{ props.compound }}层同架)</span>
        </div>
        <div  style="font-weight: bolder;display: flex;justify-content:space-between">

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

@@ -281,7 +281,7 @@
          <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
          <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
          <div style="left: 150px">{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div>({{itemFlow.order_type}})生产流程卡</div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              补片单号：{{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
@@ -299,16 +299,16 @@
      </tr>
      <tr v-for="(items,index) in item.detail" :key="index">
        <td class="tdNowrap">客户名称：</td>
        <td colspan="2">{{ items.customer_name }}</td>
        <td colspan="3">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
        <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td :colspan="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
        <td :colspan="4+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">磨边类型：</td>
        <td colspan="2">{{ itemTr.edging_type }}</td>
        <td colspan="3">{{ itemTr.edging_type }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td colspan="8">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
@@ -317,8 +317,8 @@
      <tr>
        <td rowspan='2'>序号</td>
        <td rowspan='2'>编号</td>
        <td rowspan="2">小片顺序</td>
        <td rowspan='2'>宽*高</td>
        <td rowspan="2">层号</td>
        <td rowspan='2'>宽(弧长)*高</td>
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
@@ -342,8 +342,8 @@

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td v-if="name=='金华福喜天成玻璃有限公司' || name=='浙江巨星嘉泰新材料有限公司' ">{{ itemDatile.building_number }}</td>
        <td v-else>{{ itemDatile.s01Value }}</td>
        <td class="tdNowrap" v-if="name=='金华福喜天成玻璃有限公司' || name=='浙江巨星嘉泰新材料有限公司' ">{{ itemDatile.building_number }}</td>
        <td class="tdNowrap" v-else>{{ itemDatile.s01Value }}</td>
        <td>{{ itemDatile.technology_number }}</td>
        <td>{{ itemDatile.child_width }}</td>
        <td class="item" style="width: 5%;height: 100%;">
@@ -352,12 +352,12 @@
        <td>{{ itemDatile.total_area }}</td>
        <td>{{ itemDatile.perimeter }}</td>
        <td>{{ itemDatile.bend_radius }}</td>
        <td>{{ itemDatile.patch_type }}</td>
        <td>{{ itemDatile.patch_reason }}</td>
        <td>{{ itemDatile.patch_processes }}</td>
        <td>{{ itemDatile.responsible_team }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_type }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_reason }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_processes }}</td>
        <td class="tdNowrap">{{ itemDatile.responsible_team }}</td>
        <td>{{ itemDatile.responsible_personnel }}</td>
        <td>{{ itemDatile.remarks }}</td>
        <td class="tdNowrap">{{ itemDatile.remarks }}</td>
        <template v-for=" n in item.processList.length">
          <td></td>
          <td></td>
@@ -491,7 +491,7 @@
}

.tdNowrap {

  white-space: nowrap;
}

#contentTable tfoot {

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue

@@ -288,6 +288,10 @@
    {field: 'child_height', width: 120, title: t('order.height'),filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    {field: 'thickness',filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      width: 90, title: t('order.totalThickness')},

    {field: 'quantity', width: 120, title: t('order.quantity'),filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},

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

@@ -730,7 +730,8 @@
               ''                                              as qrcode,
               ifnull(rack,"")                                  as rack,
               o.quantity as orderQuantity,
               o.area as orderArea
               o.area as orderArea,
               o.order_type
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -770,7 +771,8 @@
               #{technologyNumber}                             as technologyNumber,
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               ''                                              as qrcode
               ''                                              as qrcode,
               o.order_type
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1771,7 +1773,8 @@
               round(SUM(ogd.total_area), 2)                   as gross_area,
               sum(od.weight)                                  as weight,
               #{technologyNumber}                             as technologyNumber,
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
               o.order_type
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1859,7 +1862,8 @@
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               dd.responsible_personnel,
               #{mergeTechnologyNumber} as  mergeTechnologyNumber,
               pl.patch_id
               pl.patch_id,
               o.order_type
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -2664,7 +2668,8 @@
               fc.technology_number                            as qrcode,
               o.other_remarks,
               o.quantity as orderQuantity,
               o.area as orderArea
               o.area as orderArea,
               o.order_type
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and

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

@@ -732,7 +732,8 @@
               fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0)      as incompleteNum,
               ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
                     2)                                                             as incompleteArea,
               od.product_name
               od.product_name,
               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness

        from sd.order_detail AS od
                 LEFT JOIN sd.order_glass_detail AS ogd
@@ -750,6 +751,7 @@
                               and odpd.process_id = fc.process_id
                 left join sd.`order` as o
                           on o.order_id = od.order_id
                 left join sd.product_detail as pd on pd.prod_id=od.product_id
        where  o.create_order>0
          and odpd.process = #{selectProcesses}
          and  o.create_time >= #{selectTime1}