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

chenlu

2024-03-07 ae0bbc7e8fce2cc23e15aa730e0c53c524b4112e

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

@@ -26,7 +26,7 @@

    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);

    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String previousProcess);
    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);

    List<Map<String,String>> SelectProcessMp();

@@ -41,4 +41,8 @@
    List<Map<String,BasicDataProduce>>  selectBasicNameByType(String type);

    Integer selectMaxReportingWorkId();

    int selectGlassProcessNum(String orderNumber, String technologyNumber, String processId, String thisProcess);

    int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
}