From dca2b2714a7d52ab2d8f171b7ddb734998ae9f7c Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 14 九月 2022 10:11:57 +0800
Subject: [PATCH] 产品修改丝印锁定

---
 src/main/java/com/whyc/service/ProductBomHistoryService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 5655236..8492cc7 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.whyc.constant.UserOperation;
+import com.whyc.dto.FIleSilkLock;
 import com.whyc.dto.FileDirPath;
 import com.whyc.dto.Response;
 import com.whyc.dto.ZipUtils;
@@ -114,16 +115,20 @@
       //灏嗘病鏈夌鐞咮OM鐨刣wg鏂囦欢(涓濆嵃)鎷疯礉涓嬭浇
       fileDirName=fileDirName+File.separator+withOutDwg;
       File start = new File(fileDirName);
+      FIleSilkLock fIleSilkLock=new FIleSilkLock();
       String[] files =new String[]{};
       if(start.exists()) {
           files= start.list();//鑾峰彇璇ユ枃浠跺す涓嬬殑鎵�鏈夋枃浠跺悕瀛�
           if(files.length>=0){
               for(int i=0;i<files.length;i++) {
                   files[i]=withOutDwg+File.separator+files[i];
+                  fIleSilkLock.setFiles(files);
               }
           }
       }
-      return new Response().setIIII(1,list.size()>0,list,listsoft,files,"杩斿洖鐗╂枡淇℃伅鍙婂叧鑱旂墿鏂�");
+      List<AttachLock> attachLocks=mapper.selectInAttachLock(productId);
+      fIleSilkLock.setAttachLocks(attachLocks);
+      return new Response().setIIII(1,list.size()>0,list,listsoft,fIleSilkLock,"杩斿洖鐗╂枡淇℃伅鍙婂叧鑱旂墿鏂�");
   }
     //鍘嗗彶浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<涓嬭浇鐨勭増鏈�>)
     public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, int productId, int version) {

--
Gitblit v1.9.1