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

廖井涛

2024-08-29 b4ecc2c68b386b53caf7f19b8366ec2332ef1e9f

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

@@ -12,19 +12,19 @@
public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {


    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr,String previousProcess,String nextProcess,String process);
    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);

    List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);

    String SelectTechnologicalProcess(String processIdStr);
    String SelectTechnologicalProcess(String processIdStr, String technologyStr);

    String SelectWorkTechnologyMp(String processIdStr);

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

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

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

@@ -64,4 +64,20 @@
    Integer selectCompletedQuantity(String reportingWorkId);

    Boolean updateInventoryQuantity(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity);

    List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);

    Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);

    Boolean updateQualityStatusMp(String reportingWorkId,String username);

    List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);

    Integer selectLayerByReportingWorkId(String reportingWorkId);

    Boolean ReviewReportingWorkMp(String substring, String process, String result);

    String getPatchConditionMp(String reportingWorkId);
}