From c1f370c4ac8a60b6b2a5275ba2aebb76da00c152 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 06 十二月 2022 10:51:53 +0800
Subject: [PATCH] 软件版本锁定更新

---
 src/main/java/com/whyc/service/SoftwareService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index b335a49..a60ebbd 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -220,18 +220,20 @@
             software1.setCreateTime(date);
         }
         //閿佸畾鍘熸潵鐨勬墍鏈夌増鏈�:鏍规嵁鐗堝彿鍜岃蒋浠剁被鍨�
-        lockByBoardNumberAndType(software.getBoardNumber(),software.getType());
+        List<String> materialCodeList = softwareList.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
+        lockByBoardNumberAndTypeAndMaterialCode(software.getBoardNumber(),software.getType(),materialCodeList);
         //鍐欏叆鏁版嵁搴�
         insertBatch(softwareList);
         return new Response().set(1,true,"涓婁紶瀹屾垚");
     }
 
-    private void lockByBoardNumberAndType(String boardNumber, String type) {
+    private void lockByBoardNumberAndTypeAndMaterialCode(String boardNumber, String type, List<String> materialCodeList) {
         UpdateWrapper<Software> update = Wrappers.update();
         update.set("lock_flag",1)
                 .set("lock_reason","杞欢鐗堟湰鍗囩骇")
                 .eq("board_number",boardNumber)
-                .eq("type",type);
+                .eq("type",type)
+                .in("apply_material_code",materialCodeList);
         mapper.update(null,update);
     }
 

--
Gitblit v1.9.1