From b469df5b5c60ff98dc185368bb91a60da7340160 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 7 Jul 2025 17:26:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B4=A8=E6=A3=80=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D/=E7=BC=BA=E9=99=B7=E7=BB=B4=E6=8A=A4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/StationDefectRelation.java    | 11 ++++
 .../StationDefectRelationServiceImpl.java     | 53 ++++++++++---------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/domain/StationDefectRelation.java b/aucma-base/src/main/java/com/aucma/base/domain/StationDefectRelation.java
index 8e6d9ae..15f2ef1 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/StationDefectRelation.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/StationDefectRelation.java
@@ -1,6 +1,7 @@
 package com.aucma.base.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -96,6 +97,16 @@ public class StationDefectRelation extends BaseEntity {
     @Excel(name = "物料小类")
     private String materialSubclass;
 
+    private List<String> defectCodeList;
+
+    public List<String> getDefectCodeList() {
+        return defectCodeList;
+    }
+
+    public void setDefectCodeList(List<String> defectCodeList) {
+        this.defectCodeList = defectCodeList;
+    }
+
     public String getMaterialCategories() {
         return materialCategories;
     }
diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/StationDefectRelationServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/StationDefectRelationServiceImpl.java
index 20f1c64..d8299f9 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/StationDefectRelationServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/StationDefectRelationServiceImpl.java
@@ -9,71 +9,74 @@ import org.springframework.stereotype.Service;
 import com.aucma.base.mapper.StationDefectRelationMapper;
 import com.aucma.base.domain.StationDefectRelation;
 import com.aucma.base.service.IStationDefectRelationService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 质检工位/缺陷维护Service业务层处理
- * 
+ *
  * @author Yinq
  * @date 2023-11-27
  */
 @Service
-public class StationDefectRelationServiceImpl implements IStationDefectRelationService 
-{
+public class StationDefectRelationServiceImpl implements IStationDefectRelationService {
     @Autowired
     private StationDefectRelationMapper stationDefectRelationMapper;
 
     /**
      * 查询质检工位/缺陷维护
-     * 
+     *
      * @param objId 质检工位/缺陷维护主键
      * @return 质检工位/缺陷维护
      */
     @Override
-    public StationDefectRelation selectStationDefectRelationByObjId(Long objId)
-    {
+    public StationDefectRelation selectStationDefectRelationByObjId(Long objId) {
         return stationDefectRelationMapper.selectStationDefectRelationByObjId(objId);
     }
 
     /**
      * 查询质检工位/缺陷维护列表
-     * 
+     *
      * @param stationDefectRelation 质检工位/缺陷维护
      * @return 质检工位/缺陷维护
      */
     @Override
-    public List<StationDefectRelation> selectStationDefectRelationList(StationDefectRelation stationDefectRelation)
-    {
+    public List<StationDefectRelation> selectStationDefectRelationList(StationDefectRelation stationDefectRelation) {
         return stationDefectRelationMapper.selectStationDefectRelationList(stationDefectRelation);
     }
 
     /**
      * 新增质检工位/缺陷维护
-     * 
+     *
      * @param stationDefectRelation 质检工位/缺陷维护
      * @return 结果
      */
     @Override
-    public int insertStationDefectRelation(StationDefectRelation stationDefectRelation)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int insertStationDefectRelation(StationDefectRelation stationDefectRelation) {
+        int i = 1;
+        if (!stationDefectRelation.getDefectCodeList().isEmpty()) {
+            List<String> defectCodeList = stationDefectRelation.getDefectCodeList();
+            for (String defectCode : defectCodeList) {
+                try {
+                    stationDefectRelation.setDefectCode(defectCode);
+                    stationDefectRelationMapper.insertStationDefectRelation(stationDefectRelation);
+                } catch (Exception e) {
+                    throw new ServiceException("该工位已绑定" + stationDefectRelation.getDefectCode() + "缺陷编号！");
 
-        int i = 0;
-        try {
-            i = stationDefectRelationMapper.insertStationDefectRelation(stationDefectRelation);
-        } catch (Exception e) {
-            throw new ServiceException("该工位已绑定此缺陷！");
+                }
+            }
         }
         return i;
     }
 
     /**
      * 修改质检工位/缺陷维护
-     * 
+     *
      * @param stationDefectRelation 质检工位/缺陷维护
      * @return 结果
      */
     @Override
-    public int updateStationDefectRelation(StationDefectRelation stationDefectRelation)
-    {
+    public int updateStationDefectRelation(StationDefectRelation stationDefectRelation) {
         int i = 0;
         try {
             i = stationDefectRelationMapper.updateStationDefectRelation(stationDefectRelation);
@@ -85,25 +88,23 @@ public class StationDefectRelationServiceImpl implements IStationDefectRelationS
 
     /**
      * 批量删除质检工位/缺陷维护
-     * 
+     *
      * @param objIds 需要删除的质检工位/缺陷维护主键
      * @return 结果
      */
     @Override
-    public int deleteStationDefectRelationByObjIds(Long[] objIds)
-    {
+    public int deleteStationDefectRelationByObjIds(Long[] objIds) {
         return stationDefectRelationMapper.deleteStationDefectRelationByObjIds(objIds);
     }
 
     /**
      * 删除质检工位/缺陷维护信息
-     * 
+     *
      * @param objId 质检工位/缺陷维护主键
      * @return 结果
      */
     @Override
-    public int deleteStationDefectRelationByObjId(Long objId)
-    {
+    public int deleteStationDefectRelationByObjId(Long objId) {
         return stationDefectRelationMapper.deleteStationDefectRelationByObjId(objId);
     }
 }