新增工程按钢化版图打印标签

廖井涛

2024-08-13 093ed18bdfd3a77538230fdde69a78fa24a29dc8

新增工程按钢化版图打印标签

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -13,6 +13,7 @@
let produceList = ref([])
let labelList = ref([])
let projectNo = ref([])
let type = ref([])
let orderId = ref([])
const data = ref({
  printList: []
@@ -24,9 +25,10 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
projectNo.value = route.query.projectNo
type.value = route.query.type
onMounted(() => {
  if(projectNo.value!=null){
    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}`).then((res) => {
    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
      if (res.code == 200) {
        labelList.value = deepClone(res.data.data)
      } else {

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -29,7 +29,11 @@
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no }})
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
      break
    }
    case 'edit1' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
      break
    }
  }
@@ -138,11 +142,11 @@
  //表头参数
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
    {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {
      field: 'project_no',
      title: '工程号',
      title: t('mainIngredientStock.projectNo'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -248,7 +252,8 @@
      </template>
      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
        <el-button @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
      </template>

      <template #num1_filter="{ column, $panel }">

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

@@ -187,9 +187,9 @@
    }

    @ApiOperation("打印标签数据查询接口")
    @PostMapping("/getSelectPrintLabel/{projectNo}")
    public Result getSelectPrintLabel(@PathVariable String projectNo) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
    @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
    public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
    }

    @ApiOperation("打印标签查询接口")

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -32,7 +32,7 @@
    private String icon;
    @ExcelProperty("包装方式")
    private String packType;
    @ExcelProperty("发货名称")
    @ExcelProperty("发货时间")
    private LocalDate deliveryDate;
    @ExcelProperty("批次")
    private String batch;

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -84,6 +84,8 @@

    List<Map<String, String>> getPrintLabel(String projectNo);

    List<Map<String, String>> getPrintLabel2(String projectNo);

    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);

    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);

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

@@ -346,9 +346,14 @@
        }
    }

    public Map<String, Object> getSelectPrintLabelSv(String projectNo) {
    public Map<String, Object> getSelectPrintLabelSv(String projectNo,String type) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.getPrintLabel(projectNo));
        if(Objects.equals(type, "1")){
            map.put("data", flowCardMapper.getPrintLabel(projectNo));
        } else if (Objects.equals(type, "2")) {
            map.put("data", flowCardMapper.getPrintLabel2(projectNo));
        }

        return map;
    }


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

@@ -719,6 +719,35 @@
        order by opd.stock_id
    </select>

    <select id="getPrintLabel2">
        select o.order_id,
               c.customer_abbreviation as customer_name,
               o.project,
               od.building_number,
               od.processing_note,
               ogd.child_width         as width,
               ogd.child_height        as height,
               ogd.glass_child,
               ogd.process,
               e.type_name,
               opd.stock_id,
               od.quantity,
               od.other_columns,
               od.bend_radius
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
                           on SUBSTR(opd.process_id, 1, 10) = od.order_id and opd.order_sort = od.order_number
                 left join sd.order_glass_detail ogd
                           on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and
                              opd.layer = ogd.technology_number
                 left join sd.product p on od.product_id = p.id
                 left join sd.basic_glass_type e on e.type_id = p.type_id
                 left join sd.customer c on c.id = o.customer_id
        where opd.project_no = #{projectNo}
        order by opd.heat_layout_id,opd.heat_layout_sort desc
    </select>

    <select id="getPrintLabel1">
        select o.order_id,
               o.project,