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

guoyujie

2025-07-10 e490a85c14e9147f424b5c971b1d0d04928eb613

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java

@@ -30,5 +30,7 @@

    List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);

    String selectNextProcess(String processId, String technologyNumber, String thisProcess);
    String selectNextProcess(String processId, String technologyNumber, String thisProcess, String orderNumber);

    List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
}