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

chenlu

2024-08-15 b1c49ce18f24c7cf89c2b938f2737dba611d30ee

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

 north-glass-erp/northglass-erp/src/router/index.js

@@ -389,6 +389,16 @@
              component: () => import('../components/pp/PrintCustomLabelSemi.vue'),
            },
            {
              path: 'printCustomLabelCZ',
              name: 'printCustomLabelCZ',
              component: () => import('../views/pp/processCard/PrintCustomLabel1.vue'),
            },
            {
              path: 'printCustomLabelSemiCZ',
              name: 'printCustomLabelSemiCZ',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi1.vue'),
            },
            {
              path: 'printCustomLabelSemi2',
              name: 'printCustomLabelSemi2',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi2.vue'),

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

@@ -488,7 +488,7 @@
              dialogTableVisibleLabel.value = true
            } else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabel',
                path: '/main/processCard/PrintCustomLabelCZ',
                query: {
                  type: type,
                  faceOrientation: faceOrientation,
@@ -507,7 +507,7 @@
              dialogTableVisibleCustomLabel.value = true
            } else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabelSemi',
                path: '/main/processCard/PrintCustomLabelSemiCZ',
                query: {
                  type: type,
                  faceOrientation: faceOrientation,

 north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java

@@ -47,4 +47,6 @@
    private String totalThickness;
    @ExcelProperty("客户简称")
    private String customerAbbreviation;
    @ExcelProperty("订单加工要求")
    private String processingNotes;
}

 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -549,6 +549,7 @@
    <select id="exportOrderReport"  >
        SELECT
            *,
            b.processing_note as processingNotes,
            a.create_time as createTime,
            d.type_name as level_one,
            e.type_name as level_two
@@ -941,7 +942,7 @@
               b.delivery_address,
               b.other_money,
               b.other_money_remarks,
               b.processing_note,
               b.processing_note as processingNotes,
               b.other_remarks,
               b.area,
               b.quantity,