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

guoyuji

2024-07-18 2c296fe96659899097f650a89a56a415424c34a5

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

@@ -127,4 +127,12 @@
    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>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);

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

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

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