lyh
2025-02-14 f2f8241dd52ef12ec109f6f4f0f13042055338ac
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
@@ -88,11 +88,11 @@
        if (b && docRel) {
            DocInfo info = docInfoMapper.selectById(docId);
            //todo 修改为mdc设备
            DeviceInfo deviceInfo = deviceInfoService.getById(attrId);
            List<String> strings =  deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
            MdcEquipment mdcEquipment=iMdcEquipmentService.getById(attrId);
            List<String> strings =  iMdcProductionService.findListParentTreeAll(mdcEquipment.getId());
            if (strings != null && !strings.isEmpty()) {
                String path = StringUtils.join(strings.toArray(), "/");
                boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ deviceInfo.getDeviceNo(),
                boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ mdcEquipment.getEquipmentId(),
                        info.getDocName(), info.getDocSuffix());
                if (!deleteFile) {
                    return false;
@@ -118,8 +118,8 @@
                //处理文件名称  文件路径
                NcTxtFilePathInfo ncTxt = new NcTxtFilePathInfo();
                ncTxt.setEquipmentId(deviceInfo.getDeviceNo());
                ncTxt.setFilePath(path + "/"+ deviceInfo.getDeviceNo() + "/" );
                ncTxt.setEquipmentId(mdcEquipment.getEquipmentId());
                ncTxt.setFilePath(path + "/"+ mdcEquipment.getEquipmentId() + "/" );
                ncTxt.setFileTxtName("02A"+DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY)+sequence);
                ncTxt.setOrigFileName(info.getDocName());
                ncTxt.setOrigFileSuffix(info.getDocSuffix());