From 533ae8a2dc71edeff73f1e0c62d23718d3ff059b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 23 三月 2026 09:47:18 +0800
Subject: [PATCH] 430代码 SQL server

---
 src/main/java/com/lxzn/plm/service/impl/PdmProgramSourceServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lxzn/plm/service/impl/PdmProgramSourceServiceImpl.java b/src/main/java/com/lxzn/plm/service/impl/PdmProgramSourceServiceImpl.java
index 900fbcd..fc7120a 100644
--- a/src/main/java/com/lxzn/plm/service/impl/PdmProgramSourceServiceImpl.java
+++ b/src/main/java/com/lxzn/plm/service/impl/PdmProgramSourceServiceImpl.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.lxzn.activiti.service.IAssignFileStreamService;
 import com.lxzn.base.service.IDncLogService;
 import com.lxzn.base.service.IEquipmentClassService;
 import com.lxzn.framework.domain.base.DncLog;
@@ -88,6 +89,8 @@
     private IDncLogService dncLogService;
     @Autowired
     private IEquipmentClassService equipmentClassService;
+    @Autowired
+    private IAssignFileStreamService assignFileStreamService;
 
 
     @Value("${ncPdm.file_path}")
@@ -116,7 +119,7 @@
             JsonMapper mapper = new JsonMapper();
             try {
                 Object[] objects = new  Object[]{ncLog.getSkgxId(),ncLog.getSkgxRevId(),ncLog.getSqzt(),"",""};
-                //String program = "{\"code\":1,\"message\":\"\",\"response\":[{\"skgx_id\":\"CX淇℃伅涓績10000070\",\"skgx_rev_id\":\"1\",\"skgx_name\":\"鐒婃帴鏁版帶绋嬪簭\",\"sqzt\":\"S鐘舵�乗",\"ae8nc_cxno\":\"CX淇℃伅涓績10000070\",\"ae8nc_gfrev\":\"1\",\"ae8nc_sbno\":\"2240080\",\"ae8nc_jcid\":\"QJK006\",\"ae8nc_os\":\"鍗庝腑鏁版帶-HNC848C\",\"ae8nc_filename\":\"107052PA5\",\"ae8nc_cxfz\":\"璁$畻鏈轰豢鐪焅",\"ae8nc_operator\":\"\",\"ae8nc_inspect\":\"\",\"ae8nc_acceptview\":\"\",\"ae8nc_cxno_unit\":\"淇℃伅涓績\",\"ae8nc_filename_unit\":\"PA\",\"ae8gallery\":\"\",\"ae8nc_plant\":\"淇℃伅涓績\",\"ae8nc_modelno\":\"jx\",\"ae8nc_batchno\":\"\",\"meop_id\":\"OPHJ000000000049108\",\"meop_rev_id\":\"A\",\"meop_name\":\"鐒婃帴\",\"meop_type\":\"AE8Operation Revision\",\"ae8gx_no\":\"5\",\"process_id\":\"JZG2022008107653\",\"process_rev_id\":\"1\",\"process_name\":\"107052\",\"ae8part_no\":\"107052\",\"ae8stageidentifying\":\"L\",\"ae8gy_type\":\"鏈哄姞宸ヨ壓璁捐\",\"ae8plant\":\"淇℃伅涓績\",\"part_id\":\"1047051\",\"part_rev_id\":\"01\",\"part_name\":\"闆嗘垚娴嬭瘯浠禱",\"create_by\":\"鐢ㄦ埛2(user2)\",\"create_date\":\"02-9鏈�-22 17:15:14\",\"filename\":\"DNC-CX淇℃伅涓績10000070-1.zip\",\"filepath\":\"http://192.168.2.234:8081/ncprogram/202209/DNC-CX淇℃伅涓績10000070-1.zip\"}]}\n";
+                //String program = "{\"code\":1,\"message\":\"\",\"response\":[{\"skgx_id\":\"CX淇℃伅涓績10000070\",\"skgx_rev_id\":\"1\",\"skgx_name\":\"鐒婃帴鏁版帶绋嬪簭\",\"sqzt\":\"S鐘舵�乗",\"ae8nc_cxno\":\"CX淇℃伅涓績10000070\",\"ae8nc_gfrev\":\"1\",\"ae8nc_sbno\":\"2240080\",\"ae8nc_jcid\":\"QJK006\",\"ae8nc_os\":\"鍗庝腑鏁版帶-HNC848C\",\"ae8nc_filename\":\"107052PA5\",\"ae8nc_cxfz\":\"璁$畻鏈轰豢鐪焅",\"ae8nc_operator\":\"\",\"ae8nc_inspect\":\"\",\"ae8nc_acceptview\":\"\",\"ae8nc_cxno_unit\":\"淇℃伅涓績\",\"ae8nc_filename_unit\":\"PA\",\"ae8gallery\":\"\",\"ae8nc_plant\":\"淇℃伅涓績\",\"ae8nc_modelno\":\"jx\",\"ae8nc_batchno\":\"\",\"meop_id\":\"OPHJ000000000049108\",\"meop_rev_id\":\"A\",\"meop_name\":\"鐒婃帴\",\"meop_type\":\"AE8Operation Revision\",\"ae8gx_no\":\"5\",\"process_id\":\"JZG2022008107653\",\"process_rev_id\":\"1\",\"process_name\":\"107052\",\"ae8part_no\":\"107052\",\"ae8stageidentifying\":\"L\",\"ae8gy_type\":\"鏈哄姞宸ヨ壓璁捐\",\"ae8plant\":\"淇℃伅涓績\",\"part_id\":\"1047051\",\"part_rev_id\":\"01\",\"part_name\":\"闆嗘垚娴嬭瘯浠禱",\"create_by\":\"鐢ㄦ埛2(user2)\",\"create_date\":\"02-9鏈�-22 17:15:14\",\"filename\":\"DNC-CX淇℃伅涓績10000070-1.zip\",\"filepath\":\"http://localhost:9099/resources/images/login/bj_bak.png\"}]}\n";
                 String program =pdmWebClientApi.queryNcProgramAttrInfo(objects);
                 if (StringUtils.isEmpty(program)) {
                     log.error("======= 鏃� "+ ncLog.getSkgxId()  +" 鏂板璁板綍=======");
@@ -301,7 +304,7 @@
         PdmProgramSource source = new PdmProgramSource();
         try {
             Object[] objects = new  Object[]{ncLog.getSkgxId(),ncLog.getSkgxRevId(),ncLog.getSqzt(),"",""};
-            //String program = "{\"code\":1,\"message\":\"\",\"response\":[{\"skgx_id\":\"CX淇℃伅涓績10000070\",\"skgx_rev_id\":\"1\",\"skgx_name\":\"鐒婃帴鏁版帶绋嬪簭\",\"sqzt\":\"S鐘舵�乗",\"ae8nc_cxno\":\"CX淇℃伅涓績10000070\",\"ae8nc_gfrev\":\"1\",\"ae8nc_sbno\":\"2240080\",\"ae8nc_jcid\":\"QJK006\",\"ae8nc_os\":\"鍗庝腑鏁版帶-HNC848C\",\"ae8nc_filename\":\"107052PA5\",\"ae8nc_cxfz\":\"璁$畻鏈轰豢鐪焅",\"ae8nc_operator\":\"\",\"ae8nc_inspect\":\"\",\"ae8nc_acceptview\":\"\",\"ae8nc_cxno_unit\":\"401\",\"ae8nc_filename_unit\":\"PA\",\"ae8gallery\":\"\",\"ae8nc_plant\":\"401\",\"ae8nc_modelno\":\"jx\",\"ae8nc_batchno\":\"\",\"meop_id\":\"OPHJ000000000049108\",\"meop_rev_id\":\"A\",\"meop_name\":\"鐒婃帴\",\"meop_type\":\"AE8Operation Revision\",\"ae8gx_no\":\"5\",\"process_id\":\"JZG2022008107653\",\"process_rev_id\":\"1\",\"process_name\":\"107052\",\"ae8part_no\":\"107052\",\"ae8stageidentifying\":\"L\",\"ae8gy_type\":\"鏈哄姞宸ヨ壓璁捐\",\"ae8plant\":\"淇℃伅涓績\",\"part_id\":\"1047051\",\"part_rev_id\":\"01\",\"part_name\":\"闆嗘垚娴嬭瘯浠禱",\"create_by\":\"鐢ㄦ埛2(user2)\",\"create_date\":\"02-9鏈�-22 17:15:14\",\"filename\":\"DNC-CX淇℃伅涓績10000070-1.zip\",\"filepath\":\"http://192.168.2.234:8081/ncprogram/202209/DNC-CX淇℃伅涓績10000070-1.zip\"}]}\n";
+            //String program = "{\"code\":1,\"message\":\"\",\"response\":[{\"skgx_id\":\"CX淇℃伅涓績10000070\",\"skgx_rev_id\":\"1\",\"skgx_name\":\"鐒婃帴鏁版帶绋嬪簭\",\"sqzt\":\"S鐘舵�乗",\"ae8nc_cxno\":\"CX淇℃伅涓績10000070\",\"ae8nc_gfrev\":\"1\",\"ae8nc_sbno\":\"2240080\",\"ae8nc_jcid\":\"QJK006\",\"ae8nc_os\":\"鍗庝腑鏁版帶-HNC848C\",\"ae8nc_filename\":\"107052PA5\",\"ae8nc_cxfz\":\"璁$畻鏈轰豢鐪焅",\"ae8nc_operator\":\"\",\"ae8nc_inspect\":\"\",\"ae8nc_acceptview\":\"\",\"ae8nc_cxno_unit\":\"淇℃伅涓績\",\"ae8nc_filename_unit\":\"PA\",\"ae8gallery\":\"\",\"ae8nc_plant\":\"淇℃伅涓績\",\"ae8nc_modelno\":\"jx\",\"ae8nc_batchno\":\"\",\"meop_id\":\"OPHJ000000000049108\",\"meop_rev_id\":\"A\",\"meop_name\":\"鐒婃帴\",\"meop_type\":\"AE8Operation Revision\",\"ae8gx_no\":\"5\",\"process_id\":\"JZG2022008107653\",\"process_rev_id\":\"1\",\"process_name\":\"107052\",\"ae8part_no\":\"107052\",\"ae8stageidentifying\":\"L\",\"ae8gy_type\":\"鏈哄姞宸ヨ壓璁捐\",\"ae8plant\":\"淇℃伅涓績\",\"part_id\":\"1047051\",\"part_rev_id\":\"01\",\"part_name\":\"闆嗘垚娴嬭瘯浠禱",\"create_by\":\"鐢ㄦ埛2(user2)\",\"create_date\":\"02-9鏈�-22 17:15:14\",\"filename\":\"DNC-CX淇℃伅涓績10000070-1.zip\",\"filepath\":\"http://localhost:9099/outer/test/download.xhtml\"}]}\n";
             String program =pdmWebClientApi.queryNcProgramAttrInfo(objects);
             if (StringUtils.isEmpty(program)) {
                 log.error("======= 鏃� "+ ncLog.getSkgxId()  +" 鏂板璁板綍=======");
@@ -592,6 +595,7 @@
                         if (suffix.contentEquals("docx") || suffix.contentEquals("pdf") ) {
                             continue;
                         }
+                        source.setFileName(entry.getKey());
                         DocInfo docInfo = docInfoService.findByAttrAndDocName(FileUtil.getFilenameNonSuffix(entry.getKey()), 5,
                                 stream.getProcessId(),suffix);
                         //鏂板
@@ -632,6 +636,7 @@
                             docInfo.setPublishVersion(docFile.getDocVersion());
                             docInfo.setPublishFileId(docFile.getFileId());
                             b =  docInfoService.save(docInfo);
+                            boolean pdm =  assignFileStreamService.saveListNcFromPdm(docInfo,source);
                             if(!b){
                                 return false;
                             }
@@ -651,6 +656,8 @@
                             docInfo.setPublishVersion(docFile.getDocVersion());
                             docInfo.setPublishFileId(docFile.getFileId());
                             b = docInfoService.updateById(docInfo);
+                            //
+                            boolean pdm = assignFileStreamService.saveListNcFromPdm(docInfo,source);
                             if(!b) {
                                 return false;
                             }

--
Gitblit v1.9.3