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

廖井涛

2025-12-01 21eed4f6a8065bb59d0aaf7481dfe145dba74f2a

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java

@@ -4,8 +4,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.common.AsyncQueryExecutor;
import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.dto.pp.exportReplenishDTO;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
@@ -20,9 +23,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.CompletableFuture;


@Service
@@ -43,6 +49,10 @@

    final LogService logService;

    //多线程池
    @Resource
    private AsyncQueryExecutor asyncExecutor;

    public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper,FlowCardMapper flowCardMapper,LogService logService) {
        this.patchMapper = patchMapper;
        this.sysErrorService = sysErrorService;
@@ -58,28 +68,83 @@

    }

    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
        Integer offset = (pageNum-1)*pageSize;
//    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
//        Integer offset = (pageNum-1)*pageSize;
//        String endDate = LocalDate.now().toString();
//        String startDate = LocalDate.now().minusDays(15).toString();
//        if(selectDate !=null && selectDate.size()==2){
//            if(!selectDate.get(0).isEmpty()){
//                startDate = selectDate.get(0);
//            }
//            if(!selectDate.get(1).isEmpty()){
//                endDate = selectDate.get(1);
//            }
//        }
//        Map<String,Object> map = new HashMap<>();
//        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
//        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));
//
//        List<String> list = new ArrayList<>();
//        list.add(startDate);
//        list.add(endDate);
//        map.put("selectDate",list);
//        return map;
//    }

    public Map<String, Object> SelectReplenish(
            Integer pageNum, Integer pageSize,
            List<String> selectDate, PatchLogDTO patchLogDTO) {

        Integer offset = (pageNum - 1) * pageSize;

        // 默认时间范围：过去15天
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){

        // 用户自定义时间段
        if (selectDate != null && selectDate.size() == 2) {
            if (!selectDate.get(0).isEmpty()) {
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
            if (!selectDate.get(1).isEmpty()) {
                endDate = selectDate.get(1);
            }
        }
        Map<String,Object> map = new HashMap<>();
        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));

        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
        Map<String, Object> result = new HashMap<>();

        try {
            // 使用线程池并行执行两个SQL
            String finalStartDate = startDate;
            String finalEndDate = endDate;
            CompletableFuture<List<PatchLogDTO>> dataFuture =
                    asyncExecutor.runAsync(() ->
                            patchMapper.SelectReplenish(offset, pageSize, finalStartDate, finalEndDate, patchLogDTO));

            CompletableFuture<Map<String, Integer>> totalFuture =
                    asyncExecutor.runAsync(() ->
                            patchMapper.SelectReplenishPageTotal(offset, pageSize, finalStartDate, finalEndDate, patchLogDTO));

            // 等待两个任务都完成
            CompletableFuture.allOf(dataFuture, totalFuture).join();

            result.put("data", dataFuture.get());
            result.put("total", totalFuture.get());

            // 返回时间段
            List<String> list = new ArrayList<>();
            list.add(startDate);
            list.add(endDate);
            result.put("selectDate", list);

        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("并行查询补片记录异常：" + e.getMessage(), e);
        }

        return result;
    }


    public Boolean saveReplenish(Map<String,Object> object) {
        boolean saveState = true;
@@ -148,7 +213,8 @@
                    //判断是否已经审核
                    if(patchLog1.getReviewStatus()==0){
                        ReportingWork reportingWork = reportingWorkMapper
                                .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                                .selectOne(new QueryWrapper<ReportingWork>()
                                        .eq("reporting_work_id",patchLog.getReportingWorkId()));
                        //修改小片流程卡数量
                        patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                        //审核
@@ -224,7 +290,15 @@
                }
                else{//小片标签
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
                    List<Map<String,Object>> customDataSemi =flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber());
                    for (Map<String, Object> dataMap : customDataSemi) {
                        dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
                                flowCard.getProcessId(),
                                dataMap.get("technologyNumber").toString(),
                                flowCard.getOrderNumber()
                        ));
                    }
                    itemmap.put("data", customDataSemi);
                    list.add(itemmap);
                }

@@ -268,6 +342,13 @@
                        reportingWorkMapper.updateRWDPatchNum(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum());
                        //更新报工流程表数据
                        reportingWorkMapper.updateReplenishWorkProcess(patchLog1.getProcessId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchProcesses());

                        Log log = new Log();
                        log.setContent(object.toString());
                        log.setFunction("deleteReplenishSv补片删除");
                        log.setOperatorId((String) object.get("userId"));
                        log.setOperator((String) object.get("userName"));
                        logService.saveLog(log);
                    }
                    else{
                        saveState = false;
@@ -305,38 +386,51 @@
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //查询是否已生成工程号
                    Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId(),patchLog.getPatchId(),patchLog.getTechnologyNumber());
                    //查询流程卡工艺流程
                    String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
                    if (technologicalProcess!=null || !technologicalProcess.equals("")) {
                        String[] processList = technologicalProcess.split("->");
                        //获取工艺流程第一个工序
                        String interceptProcess = processList[0];
                        Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
                          if (firstStep>=patchLog.getPatchNum()){
                              ReportingWork reportingWork = reportingWorkMapper
                                      .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                              //修改小片流程卡数量
                              patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
                              //审核
                              patchMapper.updateReplenishCancel(patchLog);
                          }
                          else {
                              saveState = false;
                          }
                    }else{
                    if (projectCount == 0){
                        if (technologicalProcess!=null || !technologicalProcess.equals("")) {
                            String[] processList = technologicalProcess.split("->");
                            //获取工艺流程第一个工序
                            String interceptProcess = processList[0];
                            Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
                            if (firstStep>=patchLog.getPatchNum()){
                                ReportingWork reportingWork = reportingWorkMapper
                                        .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                                //修改小片流程卡数量
                                patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
                                //审核
                                patchMapper.updateReplenishCancel(patchLog);
                            }
                            else {
                                saveState = false;
                            }
                        }else{
                            saveState = false;
                        }

                        Log log = new Log();
                        log.setContent(object.toString());
                        log.setFunction("updateCancelReviewSv补片反审");
                        log.setOperatorId((String) object.get("userId"));
                        log.setOperator((String) object.get("userName"));
                        logService.saveLog(log);
                    } else {
                        saveState = false;
                    }

                    Log log = new Log();
                    log.setContent(object.toString());
                    log.setFunction("updateCancelReviewSv补片反审");
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    logService.saveLog(log);
                }
            }

        return saveState;
    }

//    public List exportReplenishSv(Map<String, Object> dates) {
//    }
    public List<exportReplenishDTO> exportReplenishSv(List<LocalDate> dates) {
        return patchMapper.exportReplenishMp(dates);
    }
}