From 898dba8c4a14d5c9e50575e81350afcf1fe3479f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 26 六月 2025 16:06:09 +0800
Subject: [PATCH] 去除工控网拷贝nc与结构树
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
index 036ac42..0686e8a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
@@ -98,15 +98,23 @@
private String secretFolder; //娑夊瘑缃戜紶杈搉c鏂囦欢澶�
@Autowired
private FileFerryService ferryService;
+ @Autowired
+ private IDocClassificationService iDocClassificationService;
@Override
@Transactional(rollbackFor = {Exception.class})
- public Result applyAssignFile(AssignFileStream stream) {
+ public Result<?> applyAssignFile(AssignFileStream stream) {
synchronized (this){
//鍒ゆ柇璁惧鐗规畩瀛楃
String specialChar = getDeviceSpecialChar(stream.getDeviceId(),stream.getFileId());
if (StrUtil.isNotEmpty(specialChar)){
//鎶涘嚭鐗规畩瀛楃寮傚父
return Result.error("鏂囦欢鍚嶇О瀛樺湪璁惧鐗规畩瀛楃");
+ }
+ //鏌ヨ鏂囨。鐨勭姸鎬侊紝鎵瑰噯鐘舵�佹墠鍙互鎸囨淳
+ DocInfo docInfo=getDocInfo(stream);
+ DocClassification docClassification=iDocClassificationService.getById(docInfo.getClassificationId());
+ if (docInfo.getDocDispatchStatus()!=null&&docInfo.getDocDispatchStatus()!=3&&docClassification.getClassificationCode().equals("nc")){
+ return Result.error("璇ユ枃浠剁姸鎬佷笉鍏佽鎸囨淳,璇峰厛瀹屾垚瀹＄娴佺▼");
}
if(flowableEnable) {
return applyAssignFileActive(stream);
@@ -258,9 +266,9 @@
}
handleFileTransfer(mdcEquipment, docFile);
//NC鏂囦欢鐨勬嫹璐�
- handleFileProcessing(docFile, mdcEquipment, secretFolder);
+// handleFileProcessing(docFile, mdcEquipment, secretFolder);
//瀵瑰簲浜у搧缁撴瀯鏍戞嫹璐�
- handleProductTree(docInfo,docRelativeList.get(0),mdcEquipment.getEquipmentId());
+// handleProductTree(docInfo,docRelativeList.get(0),mdcEquipment.getEquipmentId());
synchronizedFlagService.updateFlag(2);
return Result.OK("鎿嶄綔鎴愬姛");
}
@@ -397,9 +405,9 @@
//娑夊瘑缃戣繘琛孨C鏂囦欢鐨勬嫹璐�
handleFileTransfer(mdcEquipment, docFile);
//NC鏂囦欢鐨勬嫹璐�
- handleFileProcessing(docFile, mdcEquipment, secretFolder);
+// handleFileProcessing(docFile, mdcEquipment, secretFolder);
//瀵瑰簲浜у搧缁撴瀯鏍戞嫹璐�
- handleProductTree(docInfo,docRelativeList.get(0),mdcEquipment.getEquipmentId());
+// handleProductTree(docInfo,docRelativeList.get(0),mdcEquipment.getEquipmentId());
return synchronizedFlagService.updateFlag(1);
}else if(up.getStatus() == 3) {
//鎷掔粷鎿嶄綔 浠�涔堜篃涓嶅仛
--
Gitblit v1.9.3