廖井涛
2025-11-24 1a95bf38fead01bdc273af4e7d33a83703ab87b8
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -161,6 +161,8 @@
            //工艺流程
            map.put("technologicalProcess", technologicalProcess);
            //获取服务器时间
            map.put("reportingWorkTiem", LocalDateTime.now());
            //设备下拉框
            map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
            //班组下拉框
@@ -746,6 +748,14 @@
        JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
        ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
        List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
        ReportingWork reportingWork1 = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
                .eq(ReportingWork::getReportingWorkId, reportingWork.getReportingWorkId()));
        reportingWork.setCreatorId(reportingWork1.getCreatorId());
        reportingWork.setCreator(reportingWork1.getCreator());
        reportingWork.setUpdateTime(LocalDateTime.now());
        //查询该报工是否为报工转移订单
        Integer transferState = reportingWorkMapper.selectReviewedState(reportingWork.getReportingWorkId());
        if (transferState !=3){