Browse Source

2026-11-11

增加产品尺寸测量报告功能
master
fengyuan_yang 3 days ago
parent
commit
a994c1f353
  1. 2
      src/main/java/com/heai/modules/pms/data/PropertiesModelData.java
  2. 7
      src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java
  3. 8
      src/main/resources/mapper/pms/QcReportMapper.xml

2
src/main/java/com/heai/modules/pms/data/PropertiesModelData.java

@ -35,7 +35,7 @@ public class PropertiesModelData extends QueryPage {
/** 默认值(QmsPropertiesModelDetail.defaultValue) */ /** 默认值(QmsPropertiesModelDetail.defaultValue) */
private String defaultValue; private String defaultValue;
/** 属性类型(QmsPropertiesModelDetail.itemType,单条/多条) */
/** 已废弃,属性类型字段已从模板明细删除 */
private String itemType; private String itemType;
/** 值类型(QmsPropertiesItem.ValueType) */ /** 值类型(QmsPropertiesItem.ValueType) */

7
src/main/java/com/heai/modules/pms/service/Impl/QcReportServiceImpl.java

@ -590,13 +590,6 @@ public class QcReportServiceImpl implements QcReportService {
if (data.getLineNo() == null) { if (data.getLineNo() == null) {
throw new RuntimeException("明细序号不能为空"); 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); qcReportMapper.updateQmsPropertiesDetail(data);
} }

8
src/main/resources/mapper/pms/QcReportMapper.xml

@ -3798,7 +3798,6 @@
i.ItemDesc AS itemDesc, i.ItemDesc AS itemDesc,
d.ItemNo AS [lineNo], d.ItemNo AS [lineNo],
d.defaultValue AS defaultValue, d.defaultValue AS defaultValue,
d.itemType AS itemType,
i.ValueType AS valueType i.ValueType AS valueType
FROM QmsPropertiesModelHeader h FROM QmsPropertiesModelHeader h
inner JOIN QmsPropertiesModelDetail d ON h.CodeNo = d.CodeNo inner JOIN QmsPropertiesModelDetail d ON h.CodeNo = d.CodeNo
@ -3915,15 +3914,14 @@
</select> </select>
<insert id="insertQmsPropertiesDetail" parameterType="com.heai.modules.pms.data.PropertiesModelData"> <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> </insert>
<update id="updateQmsPropertiesDetail" parameterType="com.heai.modules.pms.data.PropertiesModelData"> <update id="updateQmsPropertiesDetail" parameterType="com.heai.modules.pms.data.PropertiesModelData">
UPDATE QmsPropertiesModelDetail UPDATE QmsPropertiesModelDetail
SET PropertiesItemNo = #{propertiesItemNo}, SET PropertiesItemNo = #{propertiesItemNo},
defaultValue = #{defaultValue},
itemType = #{itemType}
defaultValue = #{defaultValue}
WHERE CodeNo = #{codeNo} AND ItemNo = #{lineNo} WHERE CodeNo = #{codeNo} AND ItemNo = #{lineNo}
</update> </update>

Loading…
Cancel
Save