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,11 +2,9 @@
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.pp.ReportingWorkDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDate;
import java.sql.Date;
import java.util.List;
import java.util.Map;

@@ -20,7 +18,7 @@

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);

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

    String SelectWorkTechnologyMp(String processIdStr);

@@ -47,4 +45,35 @@
    int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);

    List<Map<String,Object>> selectByReportingWorkId(String reportingWorkId,String nextProcess);
    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    String selectNextProcess(String reportingWorkId);

    Integer selectCountByProcessId(String processId, String nextProcess);

    List<Map<String, Object>> reportingWorkDate(String reportingWorkId);

    Boolean updateWorkProcess(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity, Object breakageQuantity, String thisProcess);

    Boolean deleteWork(String reportingWorkId);

    String selectLastProcess(String processId);

    Map<String, Object> selectReceiptQuantity(String processId);

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