班组产量报表添加在制品名称列

chenlu

2025-03-28 fbbe81e17f9580dad96a99daad9c507a6445383e

班组产量报表添加在制品名称列

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -1002,6 +1002,7 @@
        patchNum :'عدد مجموعات التسليم',
        finished :'معدل المنتجات النهائية',
        finishedProductReport :'تقرير المنتجات النهائية',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -1002,6 +1002,7 @@
        patchNum :'Patch number',
        finished :'Rate of finished product',
        finishedProductReport :'Finished product report',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -1001,6 +1001,7 @@
        patchNum :'Количество стеклянных пластин',
        finished :'Коэффициент готовой продукции',
        finishedProductReport :'Отчет о готовой продукции',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -1012,6 +1012,7 @@
        patchNum :'补片数量',
        finished :'成品率',
        finishedProductReport :'成品报表',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{

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

@@ -266,15 +266,16 @@
      field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
    },
    {field: 'orderNumber', width: 90, title: t('order.OrderNum')},
    {field: 'code', width: 60, title: t('reportingWorks.glassNumber')},
    {field: 'width', width: 100, title: t('order.width')},
    {field: 'height', width: 100, title: t('order.height')},
    {field: 'code', width: 100, title: t('reportingWorks.glassNumber')},
    {field: 'width', width: 90, title: t('order.width')},
    {field: 'height', width: 90, title: t('order.height')},
    {field: 'workProcessName', width: 120, title: t('report.workProcessName')},
    {field: 'edgingType', width: 110, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
    {field: 'area', width: 100, title: t('reportingWorks.completedArea')},
    {field: 'reviewed', title: t('processCard.reviewed')},
    {field: 'examineTime', title: t('ingredientsStock.reviewedTime')},
    {field: 'productName', title: t('order.product')},
    {field: 'reviewed',width: 80, title: t('processCard.reviewed')},
    {field: 'examineTime',width: 80, title: t('ingredientsStock.reviewedTime')},
    {field: 'productName',width: 150, title: t('order.product')},
  ],//表头按钮

  toolbarConfig: {

 north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java

@@ -43,4 +43,6 @@
    private String reviewed;
    @ExcelProperty("审核时间")
    private String examineTime;
    @ExcelProperty("在制品名称")
    private String workProcessName;
}

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

@@ -123,6 +123,7 @@
        <result column="code" property="code"/>
        <result column="reviewed" property="reviewed"/>
        <result column="examine_time" property="examineTime"/>
        <result column="workProcessName" property="workProcessName"/>
    </resultMap>

    <resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -1331,7 +1332,8 @@
        od.product_name,
        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
        rw.reviewed,
        rw.examine_time
        rw.examine_time,
        GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
        FROM
        reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
        left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id  and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number