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

廖井涛

2024-08-29 b4ecc2c68b386b53caf7f19b8366ec2332ef1e9f

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

@@ -126,7 +126,7 @@

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

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

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

@@ -169,4 +169,8 @@
    List<Map<String, Object>> remakList(String processId);

    List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);

    List<Map<String, Object>> selectFlowCardMerge(String processId);

    Boolean updateFlowCardMerge(String processId);
}