guoyujie
2025-05-26 02609fcedd8fb55383da0a1f823a8cba913510e7
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -217,6 +217,8 @@
    public Map<String, Object> SelectProcessSv(String userId) {
        Map<String, Object> map = new HashMap<>();
        String process = reportingWorkMapper.selectUserProcess(userId);
        //工序列表
        List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
        if (process==null) {
            map.put("process", reportingWorkMapper.SelectProcessMp());
        }
@@ -229,7 +231,7 @@
                map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
            }
        }
        map.put("processNameList", processNameList);
        return map;
    }
@@ -403,7 +405,7 @@
        //获取报工工序是否为复合工程
        String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);
//合片工序
if (laminating.equals("stepA") || laminating.equals("stepB")){
if (laminating.indexOf("step")!=-1){
    LambdaUpdateWrapper
                <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper