添加报工新增界面复制功能，修改为点击次破数量列才能进入次破明细界面，改善流程卡打印排序功能

chenlu

2024-07-01 c140603c72362f7a5b2a48030eff33558e24582c

添加报工新增界面复制功能，修改为点击次破数量列才能进入次破明细界面，改善流程卡打印排序功能

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

@@ -5,6 +5,9 @@
import {ElMessage, ElMessageBox} from "element-plus"
import {CloseBold, Delete, InfoFilled} from "@element-plus/icons-vue"
import {useI18n} from "vue-i18n"
import companyInfo from "@/stores/sd/companyInfo"

const company = companyInfo()
const { t } = useI18n()

const activeName = ref('1')
@@ -178,7 +181,7 @@
                @change="changeType"
                placeholder="" >
              <el-option :label="$t('components.finishedProduct')" :value="1"/>
              <el-option :label="$t('components.semiFinishedProducts')" :value="2"/>
              <el-option :label="company.printLabel.labelType" :value="2"/>
            </el-select>
            <el-select :placeholder="$t('components.orderHeader')">
              <el-option @click="addList(keys,item)"

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -201,7 +201,7 @@
    mode: 'row',
    showStatus: true
  },
  /*menuConfig: {
  menuConfig: {
    body: {
      options: [
        [
@@ -229,7 +229,7 @@
        ]
      ]
    }
  },*/
  },
  //表头参数
  columns: [
    //  {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
@@ -422,10 +422,15 @@
    }
    //brokenGrid.value.reloadData(brokenRow.damageDetail)
    //改变brokenVisible的值触发openedBrokenTable（）方法
    brokenVisible.value = true
    const { rows, column, cell } = params; // 解构获取行、列和单元格信息
    //点击次破数量时打开明细界面
    if(column.title=="次破数量"){
      brokenVisible.value = true
    }


  },
  /*menuClick({menu, row, column}) {
  menuClick({menu, row, column}) {
    const $grid = xGrid.value
    if ($grid) {
      switch (menu.code) {
@@ -476,7 +481,7 @@
        }
      }
    }
  },*/
  },
}


@@ -639,6 +644,7 @@
  addListener(brokenGrid.value,brokenGridOptions)
  let damage =ref(brokenRow.value.damageDetails)
  brokenGrid.value.reloadData(damage.value)
  addListener(xGrid.value, gridOptions)
}


@@ -1113,6 +1119,7 @@
}
onMounted(() => {
  window.addEventListener('keypress', qrcodeScanner);
  addListener(xGrid.value, gridOptions)
})

// 在组件卸载时移除键盘事件监听

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -207,7 +207,7 @@
        return Result.seccess(flowCardService.updateComposingSv(object));
    }

    @ApiOperation("流程卡打印明细数据查询接口")
    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
    public Result printFlowCardDetails(@PathVariable String processId,
                                       @PathVariable String technologyNumber,

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

@@ -571,13 +571,15 @@
               ogd.child_width,
               ogd.child_height,
               fc.quantity,
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
               fc.sort
        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 fc.technology_number = ogd.technology_number
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
    </select>

    <update id="printSortMp">