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

廖井涛

2024-08-12 448a2f5401fe282e180b3c10b23929b67337e93e

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

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

@@ -170,6 +170,13 @@
            visible: true,
            disabled: false
          },
          {
            code: 'flashback',
            name: '倒叙',
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
@@ -423,6 +430,22 @@
          }
          break
        }
        case 'flashback' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              let val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1-1
                }
              })
            }
          }
          break
        }
      }
    }
  }

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

@@ -76,7 +76,7 @@


//修改相同产品名称标签
const updateProductName = (event, index) => {
const updateProductName = (event, index,id) => {
  // 创建映射对象
  const propertyMapping = {};
  labelList.forEach(item => {
@@ -100,12 +100,13 @@
  }

  // 遍历 lastList 并更新对应的属性
  console.log(lastList.value,id)
  console.log(lastList.value[index].glassNumber)
  lastList.value.forEach(obj => {
    // 获取前缀和 orderId
    const prefix = obj.processId.substring(0, 11);
    const orderId = obj.orderId;
    const glassNumber=obj.glassNumber

    const glassNumber=lastList.value[id].glassNumber
    // 根据 propertyName 更新属性
    if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
      obj.productAbbreviation = result;
@@ -114,7 +115,6 @@
    if (propertyName === 'project' && orderId === obj.orderId) {
      obj.project = result;
    }

    if (propertyName === 'productName' && glassNumber === obj.glassNumber){
      obj.productName = result;
    }
@@ -127,10 +127,10 @@

<template>
    <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
      <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
      <div v-for="(item1,index) in lastList" :class="company.printLabel.className.custom.entiretyName()">
        <div class="row4">{{ faceOrientation }}</div>
        <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1"  contenteditable="true" @input="updateProductName($event, id)" v-text="item.title+'：'+item1[item.name]"></div>
          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1"  contenteditable="true" @input="updateProductName($event, id,index)" v-text="item.title+'：'+item1[item.name]"></div>
<!--          <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]"  @keyup="updataProductName()" style="border: none;"/></div>-->
<!--          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>-->
        </div>

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

@@ -380,7 +380,7 @@
      </tr>
      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="29" rowspan="6" style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px">{{itemtextareas.processing_note}}</textarea>
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>

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

@@ -172,6 +172,13 @@
            visible: true,
            disabled: false
          },
          {
            code: 'flashback',
            name: '倒叙',
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
@@ -425,6 +432,22 @@
          }
          break
        }
        case 'flashback' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGridDetail.value.getTableData().visibleData
              let val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1-1
                }
              })
            }
          }
          break
        }
      }
    }
  }

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -1049,7 +1049,7 @@
const countArea = (row) => {
  const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
  let areaSum = 0
  // 获取保留面积
  // 获取保留面积,
  const decValue = company.decValue
  switch (titleUploadData.value.calculateType){
    case 2:{

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

@@ -502,13 +502,15 @@
                                          ogds.order_number,
                                          GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
                                          ogds.glass_child                                  AS concatenated_glass_child,
                                          process                                           AS processed_part
                                          process                                           AS processed_part,
                                          ogds.child_width,
                                          ogds.child_height
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child,process) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child,process,ogds.child_width,ogds.child_height) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part
               GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part,ogdss.child_width,ogdss.child_height
               order by fc.process_id, ogdss.technology_number)

              UNION
@@ -639,7 +641,7 @@
    <select id="getDetailList">
        select fc.order_number,
               concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
               od.quantity,
               fc.quantity,
               round(ogd.total_area, 2)                                     as total_area,
               od.perimeter,
               od.bend_radius,
@@ -660,7 +662,7 @@
            and fcs.process=#{process}
        where fc.process_id = #{processId}
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
    </select>

@@ -1104,7 +1106,7 @@
    <select id="getDetailListLike">
        select fc.order_number,
               concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
               od.quantity,
               fc.quantity,
               round(ogd.total_area, 2)                                     as total_area,
               od.perimeter,
               od.bend_radius,