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

chenlu

2025-02-12 33ef2b3bd1e97e392605ff4ca9a1b01f931cf447

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

@@ -107,6 +107,8 @@

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

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

    Integer getPrintLabelCount(String processId, String technologyNumber);

    List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);