chenlu
2024-05-16 9690c66ebb0e0f9322e96db318b0dbd9aeeace2f
修改删除失败后前端返回信息,修改流程卡打印界面面积精准度
6个文件已修改
2个文件已删除
844 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/Report.xml 673 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml 153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -191,7 +191,6 @@
    if ($grid) {
      switch (code) {
        case 'print': {
          console.log( selectRecords)
          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -33,7 +33,6 @@
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          handleGetQRCode()
        } else {
          ElMessage.warning(res.msg)
@@ -201,7 +200,7 @@
          数量:
          <label>{{ itemsum.quantity }}</label>
          面积:
          <label>{{ itemsum.gross_area }}</label>
          <label>{{ parseFloat(itemsum.gross_area,2) }}</label>
          重量:
          <label>{{ itemsum.weight }}</label>
        </td>
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -64,10 +64,12 @@
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
        } else {
          console.log(111)
          ElMessage.warning(res.msg)
        }
      }).catch((err) =>{
        ElMessage.warning('删除失败,检查是否已报工')
      })
      break
    }
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -31,6 +31,8 @@
          ElMessage.warning(res.msg)
        }
      }).catch((err) =>{
        ElMessage.warning('删除失败,检查下工序是否已报工')
      })
      break
    }
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -39,7 +39,9 @@
        } else {
          ElMessage.warning(res.msg)
        }
      })
      }).catch((err) =>{
          ElMessage.warning('删除失败,检查是否已分架')
        })
      break
    }
  }
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -445,7 +445,7 @@
               o.processing_note,
               fc.process_id,
               SUM( od.quantity) as quantity,
               SUM(od.gross_area) as gross_area,
               SUM(ogd.total_area) as gross_area,
               SUM(od.weight) as weight,
               #{technologyNumber} as technologyNumber,
               concat(fc.process_id,'/',#{technologyNumber}) as  processIdNumber
@@ -464,7 +464,7 @@
        select fc.order_number,
               concat(ogd.child_width, "*", ogd.child_height) as child_width,
               od.quantity,
               ogd.total_area,
               round(ogd.total_area,2) as total_area,
               od.perimeter,
               od.bend_radius,
               od.remarks
north-glass-erp/target/classes/mapper/pp/Report.xml
File was deleted
north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml
File was deleted