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

你好啊

2024-08-09 994d01a5246199cd4f9f9c021625266f5ea6febc

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

@@ -74,7 +74,7 @@

    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);

    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);

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

@@ -136,7 +136,7 @@

    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber, String process);

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