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

guoyuji

2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b

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

@@ -451,6 +451,10 @@
            Integer count = reportingWorkMapper.selectCountByProcessId(processId, nextProcess);
            //获取最后一道工序
            String lastProcess = reportingWorkMapper.selectLastProcess(processId);
            //获取是否有已补片或返工
            Integer countStates= Integer.valueOf(reportingWorkMapper.getPatchConditionMp(reportingWorkId));
            //判断是否有补片返工数据
            if (countStates==0){
            //判断是否是入库工序
            if (lastProcess.equals(thisProcess)) {//是入库工序
                //查询该流程卡数量、可入库数量、已入库数量
@@ -498,7 +502,10 @@
                    return false;
                }
            }

            }
            else {
                return false;
            }

        } else {
            return false;