Merge remote-tracking branch 'origin/master'

于杰

2025-08-01 37175875537a92930a19688ad1cc2c49fb415f0f

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

@@ -16,7 +16,7 @@

    List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
    List<Map<String,String>> SelectWorkBasicTeamsMp(String process);

    String SelectTechnologicalProcess(String processIdStr, String technologyStr);

@@ -100,4 +100,10 @@
    String getProcessLaminating(String process);

    String selectOrderid(String processIdStr);

    Map<String,Float> getFootSum(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    Integer selectReviewedState(String reportingWorkId);

    List<ReportingWork> qualityReviewSearchMp();
}