合并相关文件

你好啊

2024-08-06 a27ce393f9924c044dfe743b220f0300f33e79d3

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

@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;

import java.sql.Date;
@@ -19,7 +18,7 @@

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);

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

    String SelectWorkTechnologyMp(String processIdStr);

@@ -76,5 +75,9 @@

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

    String selectLayerByReportingWorkId(String reportingWorkId);
    Integer selectLayerByReportingWorkId(String reportingWorkId);

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

    String getPatchConditionMp(String reportingWorkId);
}