生产加工单上显示图纸和图纸尺寸调整功能，流程卡上图纸尺寸调整功能

chenlu

2 天以前 8fb3ee9eae369f7a5c39da8ed69d0e8cea3ae2f8

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

@@ -7,6 +7,8 @@
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;
@@ -95,9 +97,9 @@

        Integer offset = (pageNum - 1) * pageSize;

        // 默认时间范围：过去15天
        // 默认时间范围：过去7天
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        String startDate = LocalDate.now().minusDays(7).toString();

        // 用户自定义时间段
        if (selectDate != null && selectDate.size() == 2) {
@@ -211,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);
                        //审核
@@ -267,9 +270,27 @@
        return oddNumbers;
    }

    public Object selectPrintSv(java.sql.Date selectTime1, java.sql.Date selectTime2, FlowCard flowCard) {
    public Object selectPrintSv(List<String> selectDate, FlowCard flowCard) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectReplenishPrintMp(selectTime1,selectTime2,flowCard));
        // 默认时间范围：过去7天
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(7).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);
            }
        }
        // 返回时间段
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate", list);
        map.put("data", flowCardMapper.selectReplenishPrintMp(startDate,endDate,flowCard));
        map.put("type", flowCardMapper.selectType());
        return map;
    }
@@ -287,7 +308,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);
                }

@@ -331,6 +360,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;
@@ -408,5 +444,24 @@

        return saveState;
    }

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

    public Boolean updatePrintNumSv(List<Map<String, Object>> list) {
        if (!list.isEmpty()){
            for (Map<String, Object> item : list) {
                Integer id = (Integer) item.get("id");
                patchMapper.updatePrintNumMp(id);
            }
            return true;
        }else {
            return false;
        }

    }
}