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

guoyuji

2024-07-16 03df078310b88f2b4472c07ed9a09278b425ee00

 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);

@@ -67,4 +66,14 @@
    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);
}