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

guoyuji

2024-09-26 8c29a327707574f1e04cd25218e05ba9b4c8e4a8

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

@@ -88,6 +88,8 @@

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

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

    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);

    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);