Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-09-29 eb00feda6702005ace90e4882538b6cbf4bcb9a9

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

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

@@ -89,14 +89,7 @@
        }else {
          labelList = dataList[0]
        }
        for (let i = 0; i < list.value.length; i++) {
          let count = list.value[i].data.length
          for (let j = 0; j < count; j++) {
            for (let k = 0; k < list.value[i].data[j].quantity; k++) {
              lastList.value.push(list.value[i].data[j])
            }
          }
        }
        lastList.value = deepClone(res.data.data)
      } else {
        ElMessage.warning(res.msg)
      }

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

@@ -322,7 +322,7 @@
        v-model="dialogTableVisibleLabelXJTwo"
        :title="$t('processCard.printLabel')"
        destroy-on-close
        style="width: 80%;height:75% ">
        style="width: 80%;height:75%;overflow: auto ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
      </template>

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

@@ -689,14 +689,7 @@

    public Map<String, Object> getPrintCustomDataProjectNo(String type, String projectNo) {
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        if (!projectNo.isEmpty()) {
            Map<String, Object> itemmap = new HashMap<>();
            itemmap.put("data", flowCardMapper.getPrintCustomDataProjectNo(projectNo));
            list.add(itemmap);

        }
        map.put("data", list);
        map.put("data", flowCardMapper.getPrintCustomDataProjectNo(projectNo));
        map.put("title", flowCardMapper.getPrintTitle(type));
        return map;
    }

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

@@ -2184,8 +2184,7 @@
                 left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number and
                                                      pd.glass_sort = fc.technology_number
        where opt.project_no=#{projectNo}
        group by od.order_id,od.order_number,fc.process_id
        order by od.order_id,od.order_number
        order by opt.stock_id,opt.polys_id
    </select>

    <select id="selectUserMp">