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

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

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

@@ -166,6 +166,8 @@

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

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

    List<Map<String, String>> selectPrintNotMp(String orderId);

    List<Map<String, String>> selectPrintNotMergeMp(String orderId);