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

廖井涛

2024-07-22 6b1f2791223f1d30b80e23bf873399718f5700e6

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

@@ -122,19 +122,19 @@

    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);

    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);

    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);

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

    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);

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

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

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