1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置

lyh

2025-06-06 0871a25215fb468f121785600f796a14b54d8ebc

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

@@ -67,6 +67,9 @@
    @Autowired
    @Lazy
    private IComponentInfoService componentInfoService;
    @Autowired
    @Lazy
    private IGuideCardBatchService guideCardBatchService;

    /*备份处理*/
    @Override
@@ -159,19 +162,27 @@
            }
        }
        boolean saveBool = super.save(docInfo);
        SysParams sysParams=sysParamsService.getSysPramBySettingKey("nc_dispatch_file");
        if (sysParams ==null){
            throw new JeecgBootException("未配置导入NC与电子图版是否触发审签流程，请联系管理员");
        }else {
            if (saveBool&&sysParams.getSettingValue().equals("1")){
                //触发审签
                DispatchFile dispatchFile = new DispatchFile();
                dispatchFile.setDocId(docInfo.getDocId());
                dispatchFile.setFileId(docFile.getFileId());
                dispatchFile.setAttributionId(uploadRequest.getAttributionId());
                dispatchFile.setAttributionType(String.valueOf(uploadRequest.getAttributionType()));
                dispatchFile.setDocClassCode(uploadRequest.getDocClassCode());
                dispatchFileService.saveDispatchFile(dispatchFile);
        if (uploadRequest.getDocClassCode().equals("NC")||uploadRequest.getDocClassCode().equals("other")){
            SysParams sysParams=sysParamsService.getSysPramBySettingKey("nc_dispatch_file");
            if (sysParams ==null){
                throw new JeecgBootException("未配置导入NC与电子图版是否触发审签流程，请联系管理员");
            }else {
                if (saveBool&&sysParams.getSettingValue().equals("1")){
                    //触发审签
                    DispatchFile dispatchFile = new DispatchFile();
                    dispatchFile.setDocId(docInfo.getDocId());
                    dispatchFile.setFileId(docFile.getFileId());
                    dispatchFile.setAttributionId(uploadRequest.getAttributionId());
                    dispatchFile.setAttributionType(String.valueOf(uploadRequest.getAttributionType()));
                    dispatchFile.setDocClassCode(uploadRequest.getDocClassCode());
                    dispatchFileService.saveDispatchFile(dispatchFile);
                }
            }
        }
        if (uploadRequest.getDocClassCode().equals("NC")){
            boolean savaGuideCardBatch=guideCardBatchService.importGuideCardBatch(docInfo.getDocId(),uploadRequest.getAttributionId(),uploadRequest.getAttributionType());
            if (!savaGuideCardBatch) {
                ExceptionCast.cast(DocumentCode.DOC_BATCH_ERROR);
            }
        }
        return saveBool;