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

guoyuji

2024-12-02 e50c85b217446357771f99f34c0d3c5263a3759a

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

@@ -163,7 +163,7 @@

    List<Map<String, String>> selectPrintDetailsMp1(String orderId);

    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);

    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);

@@ -186,4 +186,8 @@
    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);

    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);

    List<Map<String, Object>> getPrintCustomDataProject(String projectNo);

    List<Map<String, String>> getPrintLabel3(String projectNo);
}