From a994c1f353e15e48d05fb4d29e53b770cadc00cd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 11 Nov 2026 16:31:19 +0800
Subject: [PATCH] =?UTF-8?q?2026-11-11=20=E5=A2=9E=E5=8A=A0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=B0=BA=E5=AF=B8=E6=B5=8B=E9=87=8F=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/modules/pms/data/PropertiesModelData.java    | 2 +-
 .../modules/pms/service/Impl/QcReportServiceImpl.java     | 7 -------
 src/main/resources/mapper/pms/QcReportMapper.xml          | 8 +++-----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/heai/modules/pms/data/PropertiesModelData.java b/src/main/java/com/heai/modules/pms/data/PropertiesModelData.java
index 21bcb6e..a528e77 100644
--- a/src/main/java/com/heai/modules/pms/data/PropertiesModelData.java
+++ b/src/main/java/com/heai/modules/pms/data/PropertiesModelData.java
@@ -35,7 +35,7 @@ public class PropertiesModelData extends QueryPage {
     /** 默认值（QmsPropertiesModelDetail.defaultValue） */
     private String defaultValue;
 
-    /** 属性类型（QmsPropertiesModelDetail.itemType，单条/多条） */
+    /** 已废弃，属性类型字段已从模板明细删除 */
     private String itemType;
 
     /** 值类型（QmsPropertiesItem.ValueType） */
diff --git a/src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java
index b22b8f1..e9be823 100644
--- a/src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java
+++ b/src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java
@@ -590,13 +590,6 @@ public class QcReportServiceImpl implements QcReportService {
         if (data.getLineNo() == null) {
             throw new RuntimeException("明细序号不能为空");
         }
-        if (StringUtils.hasText(data.getItemType())) {
-            String itemType = data.getItemType().trim();
-            if (!"单条".equals(itemType) && !"多条".equals(itemType)) {
-                throw new RuntimeException("属性类型只能是单条或多条");
-            }
-            data.setItemType(itemType);
-        }
         qcReportMapper.updateQmsPropertiesDetail(data);
     }
 
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index 4ecde4f..1d3ec91 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -3798,7 +3798,6 @@
             i.ItemDesc AS itemDesc,
             d.ItemNo AS [lineNo],
             d.defaultValue AS defaultValue,
-            d.itemType AS itemType,
             i.ValueType AS valueType
         FROM QmsPropertiesModelHeader h
         inner JOIN  QmsPropertiesModelDetail d ON h.CodeNo = d.CodeNo
@@ -3915,15 +3914,14 @@
     </select>
 
     <insert id="insertQmsPropertiesDetail" parameterType="com.heai.modules.pms.data.PropertiesModelData">
-        INSERT INTO QmsPropertiesModelDetail (CodeNo, ItemNo, PropertiesItemNo, defaultValue, itemType)
-        VALUES (#{codeNo}, #{lineNo}, #{propertiesItemNo}, #{defaultValue}, #{itemType})
+        INSERT INTO QmsPropertiesModelDetail (CodeNo, ItemNo, PropertiesItemNo, defaultValue)
+        VALUES (#{codeNo}, #{lineNo}, #{propertiesItemNo}, #{defaultValue})
     </insert>
 
     <update id="updateQmsPropertiesDetail" parameterType="com.heai.modules.pms.data.PropertiesModelData">
         UPDATE QmsPropertiesModelDetail
         SET PropertiesItemNo = #{propertiesItemNo},
-            defaultValue = #{defaultValue},
-            itemType = #{itemType}
+            defaultValue = #{defaultValue}
         WHERE CodeNo = #{codeNo} AND ItemNo = #{lineNo}
     </update>