1.修改检索nc文件bug 2.新增刀具列表查询接口 3.程序加工确认表确认流程

lyh

2025-06-17 a7a3e876c467a401ecec1a084acb8edc0927d10b

1.修改检索nc文件bug
2.新增刀具列表查询接口
3.程序加工确认表确认流程

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java

@@ -1,5 +1,7 @@
package org.jeecg.modules.dnc.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -13,6 +15,7 @@

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

@Slf4j
@Api(tags = "刀具信息")
@@ -35,6 +38,25 @@
    }

    /**
     * æŸ¥è¯¢åˆ€å…·List
     * @param cutter
     * @return
     */
    @AutoLog(value = "刀具信息-查询刀具List")
    @ApiOperation(value = "刀具信息-查询刀具List", notes = "刀具信息-查询刀具List")
    @GetMapping("/getList")
    public Result<?> getList( Cutter cutter){
        QueryWrapper<Cutter> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getDocId()),"doc_id",cutter.getDocId());
        queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterName()),"cutter_name",cutter.getCutterName());
        queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterType()),"cutter_type",cutter.getCutterType());
        queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterSpacing()),"cutter_spacing",cutter.getCutterSpacing());
        queryWrapper.orderByDesc("create_time");
        List<Cutter> list = service.list(queryWrapper);
        return Result.OK(list);
    }

    /**
     * æ–°å¢žåˆ€å…·ä¿¡æ¯
     * @param cutter
     * @return

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/GuideCardBatchController.java

@@ -12,6 +12,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dnc.entity.GuideCardBatch;
import org.jeecg.modules.dnc.service.IGuideCardBatchService;
import org.jeecg.modules.dncFlow.vo.GuideCardBatchFlowTaskVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -139,6 +140,28 @@
    }

    /**
      * å‘起确认流程
      * @param id
      * @return
      */
     @ApiOperation(value="nc文件对应数控程序加工确认表-发起确认流程", notes="nc文件对应数控程序加工确认表-发起确认流程")
     @GetMapping(value = "/startGuideCardBatch")
     public Result<?> startGuideCardBatch(String id){
         return guideCardBatchService.startGuideCardBatch(id);
     }

     /**
      * æµç¨‹èŠ‚点审核
      * @param guideCardBatchFlowTaskVo
      * @return
      */
     @ApiOperation(value="nc文件对应数控程序加工确认表-流程节点审核", notes="nc文件对应数控程序加工确认表-流程节点审核")
     @PostMapping(value = "/auditGuideCardBatch")
     public Result<?> auditGuideCardBatch(@RequestBody GuideCardBatchFlowTaskVo guideCardBatchFlowTaskVo){
         return guideCardBatchService.auditGuideCardBatch(guideCardBatchFlowTaskVo);
     }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java

@@ -9,6 +9,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -104,6 +105,7 @@
    /**编写人*/
    @Excel(name = "编写人", width = 15)
    @ApiModelProperty(value = "编写人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String compiler;
    /**编写日期*/
    @Excel(name = "编写日期", width = 15, format = "yyyy-MM-dd")
@@ -114,6 +116,7 @@
    /**校对人*/
    @Excel(name = "校对人", width = 15)
    @ApiModelProperty(value = "校对人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String proofreader;
    /**校对日期*/
    @Excel(name = "校对日期", width = 15, format = "yyyy-MM-dd")
@@ -124,6 +127,7 @@
    /**操作者*/
    @Excel(name = "操作者", width = 15)
    @ApiModelProperty(value = "操作者")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String operator;
    /**首检日期*/
    @Excel(name = "首检日期", width = 15, format = "yyyy-MM-dd")
@@ -131,9 +135,14 @@
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "首检日期")
    private Date inspectionTime;
    /**首检意见*/
    @Excel(name = "首检意见", width = 15)
    @ApiModelProperty(value = "首检意见")
    private String inspectionOpinion;
    /**审批人*/
    @Excel(name = "审批人", width = 15)
    @ApiModelProperty(value = "审批人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String approver;
    /**审批日期*/
    @Excel(name = "审批日期", width = 15, format = "yyyy-MM-dd")
@@ -143,6 +152,7 @@
    private Date approverTime;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IGuideCardBatchService.java

@@ -1,7 +1,9 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.GuideCardBatch;
import org.jeecg.modules.dncFlow.vo.GuideCardBatchFlowTaskVo;

/**
 * @Description: nc文件对应数控程序加工确认表
@@ -24,4 +26,18 @@
     * @return
     */
    boolean importGuideCardBatch(String docId,String attributionId,Integer attributionType);

    /**
     * å‘起确认流程
     * @param id
     * @return
     */
    Result<?> startGuideCardBatch(String id);

    /**
     * æµç¨‹èŠ‚点审核
     * @param guideCardBatchFlowTaskVo
     * @return
     */
    Result<?> auditGuideCardBatch(GuideCardBatchFlowTaskVo guideCardBatchFlowTaskVo);
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java

@@ -1,21 +1,39 @@
package org.jeecg.modules.dnc.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.dnc.constant.DocAttributionTypeEnum;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.mapper.GuideCardBatchMapper;
import org.jeecg.modules.dnc.response.ActivitiCode;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.UcenterCode;
import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dncFlow.constant.GuideCardBatchEnum;
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.vo.GuideCardBatchFlowTaskVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import java.util.*;

/**
 * @Description: nc文件对应数控程序加工确认表
@@ -23,17 +41,14 @@
 * @Date:   2025-05-27
 * @Version: V1.0
 */
@Service
public class GuideCardBatchServiceImpl extends ServiceImpl<GuideCardBatchMapper, GuideCardBatch> implements IGuideCardBatchService {
@Service("IGuideCardBatchService")
public class GuideCardBatchServiceImpl extends ServiceImpl<GuideCardBatchMapper, GuideCardBatch> implements IGuideCardBatchService , FlowCallBackServiceI {

    @Autowired
    private ISysDictService sysDictService;

    @Autowired
    private IDocInfoService docInfoService;

    @Autowired
    private IDocRelativeService docRelativeService;

    @Autowired
    private IPartsInfoService partsInfoService;
@@ -46,6 +61,17 @@

    @Autowired
    private IDeviceTypeService deviceTypeService;

    @Resource
    private FlowCommonService flowCommonService;
    @Resource
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowTaskService flowTaskService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;

    /**
     * ç”Ÿæˆæµæ°´å·
@@ -143,4 +169,179 @@
        guideCardBatch.setCreateTime(new Date());
        return this.save(guideCardBatch);
    }

    /**
     * å‘起确认流程
     * @param id
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result<?> startGuideCardBatch(String id){
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        //获取程序加工确认表
        GuideCardBatch guideCardBatch=this.getById(id);
        if (guideCardBatch==null) {
            return Result.ok("未找到对应的程序加工确认表");
        }
        //填充数据
        guideCardBatch.setCompiler(user.getUsername());
        guideCardBatch.setCompilerTime(new Date());
        guideCardBatch.setFlowStatus(GuideCardBatchEnum.VERIFY.getCode());
        this.updateById(guideCardBatch);
        System.out.println("程序加工确认表 ç¡®è®¤æµç¨‹ï¼š" + guideCardBatch.getId());
        flowCommonService.initActBusiness("流水号："+guideCardBatch.getSerialNumber()+" ç¨‹åºåŠ å·¥ç¡®è®¤è¡¨è¿›è¡Œç¡®è®¤æµç¨‹",
                guideCardBatch.getId(), "IGuideCardBatchService", "nc_guide_card_batch", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", guideCardBatch.getId());
        variables.put("organization", "用户"+user.getRealname()+"发起流程");
        variables.put("comment",  "用户"+user.getRealname()+"发起流程");
        variables.put("proofreading",true);
        Result result= flowDefinitionService.startProcessInstanceByKey("nc_guide_card_batch", variables);
        if (!result.isSuccess()) {
            guideCardBatch.setCompiler(null);
            guideCardBatch.setCompilerTime(null);
            this.updateById(guideCardBatch);
        }
        return result;
    }

    /**
     * æµç¨‹èŠ‚点审核
     * @param guideCardBatchFlowTaskVo
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result<?> auditGuideCardBatch(GuideCardBatchFlowTaskVo guideCardBatchFlowTaskVo){
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        try {
            // å‚数校验
            if (!ValidateUtil.validateString(guideCardBatchFlowTaskVo.getTaskId()) || !ValidateUtil.validateString(guideCardBatchFlowTaskVo.getDataId())) {
                return Result.error(CommonCode.INVALID_PARAM.toString());
            }
            String userId = user.getId();
            guideCardBatchFlowTaskVo.setAssignee(user.getUsername());
            if (!ValidateUtil.validateString(userId)) {
                return Result.error(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST.toString());
            }

            // æ•°æ®æŸ¥è¯¢
            GuideCardBatch guideCardBatch = this.getById(guideCardBatchFlowTaskVo.getDataId());
            if (guideCardBatch == null) {
                return Result.error(CommonCode.INVALID_PARAM.toString());
            }
            DocInfo docInfo = docInfoService.getById(guideCardBatch.getDocId());
            if (docInfo == null) {
                return Result.error(ActivitiCode.ACT_DOC_ERROR.toString());
            }

            // 2. æŸ¥è¯¢æµç¨‹ä¸šåŠ¡è®°å½•ï¼ˆå¤„理空结果）
            List<FlowMyBusiness> businessList = flowMyBusinessService.list(
                    new QueryWrapper<FlowMyBusiness>()
                            .eq("process_instance_id", guideCardBatchFlowTaskVo.getInstanceId())
            );
            if (businessList.isEmpty()) {
                return Result.error("流程记录不存在");
            }
            FlowMyBusiness flowMyBusiness = businessList.get(0);

            // 3. æ ¡éªŒç”¨æˆ·æ˜¯å¦ä¸ºå€™é€‰å¤„理人
            List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
            if (todoUsers == null || !todoUsers.contains(user.getUsername())) {
                return Result.error("用户无权操作此任务");
            }

            // 4. è®¤é¢†ä»»åŠ¡ï¼ˆå¤„理已被认领的情况）
            String taskId = flowMyBusiness.getTaskId();
            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
            if (task == null) {
                return Result.error("任务不存在或已完成");
            }
            if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
                return Result.error("任务已被他人认领");
            }
            taskService.claim(taskId, user.getUsername());

            // è®¾ç½®æµç¨‹å˜é‡
            Map<String, Object> values = new HashMap<>();
            values.put("dataId", guideCardBatch.getId());
            values.put("assignee", userId);
            values.put("comment", guideCardBatchFlowTaskVo.getComment());
            values.put("organization", guideCardBatchFlowTaskVo.getComment());
            if (guideCardBatchFlowTaskVo.getCheckType() != null) {
                values.put("checkType", guideCardBatchFlowTaskVo.getCheckType());
            }
            if (guideCardBatchFlowTaskVo.getConfirmType() != null) {
                values.put("confirmType", guideCardBatchFlowTaskVo.getConfirmType());
            }
            if (guideCardBatchFlowTaskVo.getApproveType() != null) {
                values.put("approveType", guideCardBatchFlowTaskVo.getApproveType());
            }
            guideCardBatchFlowTaskVo.setValues(values);
            // å®Œæˆæµç¨‹ä»»åŠ¡
            Result result = flowTaskService.complete(guideCardBatchFlowTaskVo);
            if (result.isSuccess()) {
                if (guideCardBatchFlowTaskVo.getCheckType() != null) {
                    if (guideCardBatchFlowTaskVo.getCheckType()){
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.CONFIRM.getCode());
                        guideCardBatch.setProofreader(user.getUsername());
                        guideCardBatch.setProofreaderTime(new Date());
                    }else {
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.PREPARE.getCode());
                    }
                }
                if (guideCardBatchFlowTaskVo.getConfirmType() != null) {
                    if (guideCardBatchFlowTaskVo.getConfirmType()){
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.APPROVE.getCode());
                        guideCardBatch.setOperator(user.getUsername());
                        guideCardBatch.setInspectionTime(new Date());
                        guideCardBatch.setInspectionOpinion(guideCardBatchFlowTaskVo.getInspectionOpinion());
                    }else {
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.PREPARE.getCode());
                    }
                }
                if (guideCardBatchFlowTaskVo.getApproveType() != null) {
                    if (guideCardBatchFlowTaskVo.getApproveType()){
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.COMPLETE.getCode());
                        guideCardBatch.setApprover(user.getUsername());
                        guideCardBatch.setApproverTime(new Date());
                    }else {
                        guideCardBatch.setFlowStatus(GuideCardBatchEnum.PREPARE.getCode());
                        }
                }
                this.updateById(guideCardBatch);
            } else {
                return result;
            }
            return Result.OK("操作成功");
        } catch (Exception e) {
            // è®¾ç½®äº‹åŠ¡å›žæ»š
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return Result.error("操作失败：" + e.getMessage());
        }
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        return null;
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java

@@ -540,10 +540,10 @@
            List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(processIds,
                    DocAttributionTypeEnum.PROCESS.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
            if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
                List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                docQuery.setAttributionIds(String.join(",",deviceTypeIds));
                docQuery.setDocClassCode("NC");
                docQuery.setAttributionType(DocAttributionTypeEnum.PROCESS.getCode());
                docInfos=docInfoService.findListByDocQuery(docQuery);
@@ -554,6 +554,10 @@
                treeInfoRequest.setProcessIds(id);
                List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
                docInfos.addAll(docInfoList);
            }else {
                treeInfoRequest.setProcessIds(processIds);
                List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
                docInfos.addAll(docInfoList);
            }
            return docInfos;
        }

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java

@@ -469,10 +469,10 @@
            List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(workStepIds,
                    DocAttributionTypeEnum.WORKSITE.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
            if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
                List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getDeviceManagementId).collect(Collectors.toList());
                List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                docQuery.setAttributionIds(String.join(",",deviceTypeIds));
                docQuery.setDocClassCode("NC");
                docQuery.setAttributionType(DocAttributionTypeEnum.WORKSITE.getCode());
                docInfos=docInfoService.findListByDocQuery(docQuery);

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/constant/DispatchFileEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package org.jeecg.modules.dncFlow.constant;

public enum DispatchFileEnum {
    COMPLETE("1", "编制"),

    VERIFY("2", "校对"),

    APPROVE("3", "批准");

    private String code;
    private String name;

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    DispatchFileEnum() {
    }

    DispatchFileEnum(String code, String name) {
        this.code = code;
        this.name = name;
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/constant/GuideCardBatchEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package org.jeecg.modules.dncFlow.constant;

public enum GuideCardBatchEnum {
    PREPARE("1", "编制"),

    VERIFY("2", "校对"),

    CONFIRM("3", "操作确认"),

    APPROVE("4", "审批"),

    COMPLETE("5", "完成");


    private String code;
    private String name;

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    GuideCardBatchEnum() {
    }

    GuideCardBatchEnum(String code, String name) {
        this.code = code;
        this.name = name;
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/vo/GuideCardBatchFlowTaskVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package org.jeecg.modules.dncFlow.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;

@Data
@ApiModel("程序加工确认表工作流任务相关--请求参数")
public class GuideCardBatchFlowTaskVo extends FlowTaskVo {
    /**
     * taskIds
     */
    private String taskIds;

    /**
     * æ ¡å¯¹ç±»åž‹
     * true:校对通过
     * false:校对不通过
     */
    private Boolean checkType;

    /**
     * ç¡®è®¤ç±»åž‹
     * true:确认通过
     * false:确认不通过
     */
    private Boolean confirmType;

    /**
     * å®¡æ‰¹ç±»åž‹
     * true:审批通过
     * false:审批不通过
     */
    private Boolean approveType;

    /**首检意见*/
    private String inspectionOpinion;
}