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

廖井涛

2024-10-17 904ea395e49e87b0f0d22a7fab8e8667d7ec10d1

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

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

@@ -52,7 +52,8 @@
  filmNumber:'产品备注',
  bendRadius:'order.bendRadius',
  glassChild:'reportingWorks.glassChild',
  glassAddress:'replenish.sliceMarking'
  glassAddress:'replenish.sliceMarking',
  quantity:'工程用数量'




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

@@ -750,11 +750,13 @@
            let leftData = $tableRight.getTableData().fullData
            if (selectRecords.length === 0) {
              ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
              gridLeftOptions.toolbarConfig.buttons[0].disabled=false
              return
            }

            if (leftData.length > 0) {
              ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
              gridLeftOptions.toolbarConfig.buttons[0].disabled=false
              return;
            }
            let flowCardData = ref({

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

@@ -547,7 +547,7 @@
          }

          labelRow.value.list = JSON.stringify(selectRecords)
          labelRow.value.type = '恒鑫'
          labelRow.value.type = '恒鑫带数量'
          labelRow.value.dataType=3
          dialogTableVisibleLabelXJTwo.value = true


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

@@ -2114,7 +2114,8 @@
               '文本' as custom2,
               '文本' as custom3,
               '文本' as custom4,
               '文本' as custom5
               '文本' as custom5,
               od.quantity
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join flow_card as fc on o.order_id = fc.order_id and