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

chenlu

2024-12-16 6ded5f4ababd82c4c93b5e88b1132f1869340776

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

@@ -75,7 +75,11 @@

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

    List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);

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

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

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

@@ -125,6 +129,8 @@

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

    List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,Integer orderNumber,Integer quantity);

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

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