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

chenlu

2025-07-22 b9e4e2edbb3767ee347a91d2238544ae736b53c0

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

@@ -113,7 +113,7 @@

    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);

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

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

@@ -261,4 +261,6 @@
    List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);

    List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);

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