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

wuyouming666

2025-03-04 f0968dbdfd956ae035cbc994ccb4eb374b6c8074

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

@@ -305,8 +305,11 @@
            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());
                    //查询流程卡工艺流程
                    String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
                    if (projectCount == 0){
                    if (technologicalProcess!=null || !technologicalProcess.equals("")) {
                        String[] processList = technologicalProcess.split("->");
                        //获取工艺流程第一个工序
@@ -333,6 +336,10 @@
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    logService.saveLog(log);
                    } else {
                        saveState = false;
                    }

                }
            }