补片流程卡添加是否合并打印配置，次破汇总报表添加平方毫米列

chenlu

6 小时以前 19e06921635f43820c700463df8138a746e96591

补片流程卡添加是否合并打印配置，次破汇总报表添加平方毫米列

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

@@ -92,6 +92,7 @@
        //流程卡
        request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
          if (res.code == 200) {
            console.log(res.data.data)
            load(res.data.data)
          } else {
            ElMessage.warning(res.msg)
@@ -369,7 +370,8 @@
      <td v-if="name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'"  colspan="4">{{ itemTr.other_remarks }}</td>
      <td v-else colspan="4">{{ itemTr.edging_type }}</td>
      <td class="tdNowrap">单片名称：</td>
      <td colspan="3">{{ itemTr.glass_child }}</td>
      <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
      <td v-else colspan="3" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
      <td class="tdNowrap">产品名称：</td>

      <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>

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

@@ -55,19 +55,7 @@

let name=company.companyName
let replenishQRCode=company.replenishQRCode
//去除重复对象
// let uniqueObjects = {};
// // éåŽ†åŽŸå§‹æ•°æ®æ•°ç»„
// data.value.printList.forEach(obj => {
//   // æž„建一个唯一键，例如 'NG24071502A001_1'
//   let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
//
//   // å¦‚果该键不存在于 uniqueObjects ä¸­ï¼Œåˆ™å°†è¯¥å¯¹è±¡æ·»åŠ åˆ° uniqueObjects ä¸­
//   if (!uniqueObjects[key]) {
//     uniqueObjects[key] = obj;
//   }
// });
// data.value.printList = Object.values(uniqueObjects);

let flowCardCount = null
onMounted(() => {
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
@@ -95,43 +83,13 @@
            });
            produceList.value[j].detail[0].weight = sumWeight
          }
          //处理合并打印
          // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
          //
          //   produceList.value.forEach(item => {
          //     item.detail[0].technologyNumber = printMerge;
          //   });
          //
          //   //合并打印工艺流程处理
          //   if (like == null) {
          //     let process = produceList.value[0].detail[0].process
          //     console.log(process)
          //     let indexOfJiaJiao = process.indexOf('夹胶');
          //     if (indexOfJiaJiao !== -1) {
          //       // ä½¿ç”¨ substring æˆªå– "夹胶" åŽé¢çš„部分，包括 "夹胶" æœ¬èº«
          //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
          //       produceList.value.forEach(item => {
          //         item.detail[0].process = afterJiaJiao
          //       })
          //     }
          //
          //     let indexOfProceList = produceList.value[0].processList
          //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
          //
          //     if (getProceList !== -1) {
          //       // ä½¿ç”¨ filter æ–¹æ³•è¿‡æ»¤å‡º "夹胶" åŠå…¶ä¹‹åŽçš„对象
          //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
          //     }
          //   }
          // }


          produceList.value.forEach(item => {
            let technologyNumberMerge = printMerge.split('').join(',');
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })
          //处理编号列
          //定义存放编号数组
          //定义存放编号数组 å¤©æ´¥
          const s01Values = [];
          for (let i = 0; i < produceList.value.length; i++) {
            const s01Values = [];
@@ -172,8 +130,10 @@
          }, {});

          // å°†åˆå¹¶åŽçš„对象转换回数组
          produceList.value = Object.values(mergedData);

          if (company.printReplenishMerge){
            produceList.value = Object.values(mergedData);
          }
           flowCardCount=produceList.value.length

          handleSummary()
@@ -191,12 +151,15 @@
    }
)

const techNumberLength = ref()
const qrcodeLength =ref()
const handleGetQRCode = async () => {
  for (let i = 0; i < produceList.value.length; i++) {
    const detailItem = produceList.value[i].detail[0];
    const detailList = produceList.value[i].detailList;

    const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();

    const processId = detailItem.process_id;

    detailItem.qrcodeList = [];
@@ -292,7 +255,7 @@
              <span v-if="name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
              æµç¨‹å¡å·ï¼š {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} å…± {{ item.count }} æž¶
              }}/{{ itemFlow.technologyNumber }}
            </div>
          </div>
        </td>
@@ -310,9 +273,11 @@
        <td class="tdNowrap">磨边类型：</td>
        <td colspan="3">{{ itemTr.edging_type }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td colspan="8">{{ itemTr.glass_child }}</td>
        <td v-if="itemTr.qrcodeList.length*1>1" colspan="8">多层合并，详情见产品名称</td>
        <td v-else colspan="8">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
        <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
        <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÉϺ£±±²£.js

@@ -54,6 +54,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -53,6 +53,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -53,6 +53,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -53,6 +53,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÂåÑô±±²£.js

@@ -54,6 +54,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÎÂÖݾÞÐÇ.js

@@ -55,6 +55,7 @@
        soleQRCode:false,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"07:30",//次破、产量报表默认时间
        processFontSize:true,//流程卡加工要求字体加大
        printReplenishMerge:false,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -55,6 +55,7 @@
        soleQRCode:true,//流程卡合并二维码显示单层，义乌true.其它false
        reportTime:"08:00",//次破、产量报表默认时间
        processFontSize:false,//流程卡加工要求字体加大
        printReplenishMerge:true,//补片流程卡打印是否同流程卡合并
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue

@@ -340,8 +340,11 @@
      filterMethod: filterChanged,
      width:100
    },
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",
      width:90},
    {field: 'technology_number', title: t('processCard.technologyNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged, showOverflow: "ellipsis",
      width:100},
    {field: 'child_width', title: t('order.width'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
    {field: 'child_height', title: t('order.height'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
    {

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

@@ -47,6 +47,7 @@
    {field: 'childWidth', width: 100, title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'childHeight', width: 100, title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'thickness',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90, title: t('order.totalThickness')},
    {field: 'pingfang', width: 90, title: t('report.thicknessArea')},
    {field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken')},
    {field: 'area', width: 120, title: t('reportingWorks.wornArea')},
    {field: 'personnel', width: 120, title: t('reportingWorks.responsiblePersonnel')},
@@ -57,7 +58,7 @@
  url :'/report/damageReport',
  exportUrl :'/report/exportDamageReport',
  exportName:t('report.secondaryBrokenTotal'),
  footList:['breakageQuantity','area']
  footList:['breakageQuantity','area','pingfang']
})

</script>

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

@@ -50,6 +50,8 @@
    private Double childHeight;
    @ExcelProperty("厚度")
    private String thickness;
    @ExcelProperty("平方毫米")
    private String pingfang;
    @ExcelProperty("报工工序")
    private String thisProcess;
    @ExcelProperty("创建人")

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -903,13 +903,16 @@
                List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
                //工序列表
                List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
                itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
                itemmap.put("processList", processList);
                itemmap.put("processNameList", processNameList);
                //  itemmap.put("numberList", numberList);
                list.add(itemmap);

            }

        }

        map.put("data", list);
        //初始化值
        printLike = null;

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

@@ -833,7 +833,9 @@
        rw.this_process,
        rw.creator,
        rw.reporting_work_id,
        JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
        JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
        ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
        * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
        FROM
        sd.ORDER AS o
        LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -1441,7 +1443,9 @@
               rw.this_process,
               rw.creator,
               rw.reporting_work_id,
               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
            ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
            * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
        FROM sd.ORDER AS o
                 LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
                 LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
@@ -2721,7 +2725,9 @@
    <select id="damageReportFootSum">
        SELECT
            SUM(dd.breakage_quantity) AS breakageQuantity,
            ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area
            ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area,
        SUM(ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
        * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2)) AS pingfang
        FROM
            sd.ORDER AS o
                LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id