From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java |   10 +++++-----
 1 files changed, 5 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 18f1a94..4a8d8ed 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
@@ -113,7 +113,7 @@
             //鏌ヨ鏂囨。鐨勭姸鎬侊紝鎵瑰噯鐘舵�佹墠鍙互鎸囨淳
             DocInfo docInfo=getDocInfo(stream);
             DocClassification docClassification=iDocClassificationService.getById(docInfo.getClassificationId());
-            if (docInfo.getDocDispatchStatus()!=null&&docInfo.getDocDispatchStatus()!=3&&docClassification.getClassificationCode().equals("nc")){
+            if (docInfo.getDocDispatchStatus()!=null&&docInfo.getDocDispatchStatus()!=3&&docInfo.getDocDispatchStatus()!=5&&docClassification.getClassificationCode().equals("nc")){
                 return Result.error("璇ユ枃浠剁姸鎬佷笉鍏佽鎸囨淳,璇峰厛瀹屾垚瀹$娴佺▼");
             }
             if(flowableEnable) {
@@ -266,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("鎿嶄綔鎴愬姛");
     }
@@ -405,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