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

廖井涛

2024-10-14 b7546c0dcc65d193b7a549aa267a70a1a2dcac61

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

@@ -165,6 +165,8 @@

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

    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);

    String selectUserMp(String userId);

    List<Map<String, Object>> selectSortTableMp(String orderId);
@@ -177,7 +179,11 @@

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

    Boolean updateFlowCardMerge(String processId);
    Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);

    Boolean deleteflowCardSort(String orderId, String processId);

    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);

    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
}