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

chenlu

2025-07-28 a99c1f36e52c75e0020127c62d39c1eddae4a036

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

@@ -8,7 +8,6 @@
import org.apache.ibatis.annotations.Param;

import java.sql.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -27,11 +26,11 @@

    void insertByReportingWorkDetail(ReportingWorkDetail reportingWorkDetail, String processId, String thisProcess);

    List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2);
    List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2, String orderId);

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

    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 startDate,String endDate);
    List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
}