Browse Source

feat(pms): 添加设备属性项目查询功能

- 在EamMapper中新增getEamPropertiesItemByItemNo方法接口
- 实现SQL映射查询设备属性项目的详细信息
- 包含业务描述、操作员信息及检验方法等字段
- 关联设备属性项目表与质量控制方法表进行数据查询
- 在EamService中新增对应的服务层方法定义
master
qiankanghui 3 weeks ago
parent
commit
350850442f
  1. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  2. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamService.java
  3. 48
      src/main/resources/mapper/pms/EamMapper.xml

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@ -530,5 +530,7 @@ public interface EamMapper {
void saveSoundBoxEmailLog(com.xujie.sys.modules.pms.entity.SoundBoxEmailLog log); void saveSoundBoxEmailLog(com.xujie.sys.modules.pms.entity.SoundBoxEmailLog log);
QcItemData getEamPropertiesItemByItemNo(@Param("data") QcItemData data);
List<EamMaintainOrderExportData> eamWorkOrderSearchList(@Param("query") EamWorkOrderInData inData); List<EamMaintainOrderExportData> eamWorkOrderSearchList(@Param("query") EamWorkOrderInData inData);
} }

2
src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@ -1220,5 +1220,7 @@ public interface EamService {
void sendSoundBox(); void sendSoundBox();
QcItemData getEamPropertiesItemByItemNo(QcItemData data);
List<EamMaintainOrderExportData> eamWorkOrderSearchList(EamWorkOrderInData data); List<EamMaintainOrderExportData> eamWorkOrderSearchList(EamWorkOrderInData data);
} }

48
src/main/resources/mapper/pms/EamMapper.xml

@ -4148,6 +4148,53 @@
select site, component_part_no as componentPartNo, notify_no as notifyNo select site, component_part_no as componentPartNo, notify_no as notifyNo
from sound_box_email_log from sound_box_email_log
</select> </select>
<select id="getEamPropertiesItemByItemNo" resultType="com.xujie.sys.modules.pms.data.QcItemData">
SELECT
epi.site,
epi.bu_no,
dbo.get_bu_desc(epi.site, epi.bu_no) as buDesc,
epi.ItemNo,
epi.ItemDesc,
epi.DefaultValue,
epi.ValueType,
epi.ValueType_DB as valueTypeDb,
epi.ValueChooseFlag,
epi.CreatedDate,
epi.CreatedBy,
dbo.getOperatorDesc(epi.site, epi.CreatedBy) as createdByDesc,
epi.MaxValue,
epi.MinValue,
epi.ItemRemark,
epi.ItemType,
epi.update_date,
epi.update_by,
dbo.getOperatorDesc(epi.site, epi.update_by) as updateByDesc,
qm.method_no,
qm.method_name,
qm.method_remark,
epi.inspection_type_no,
epi.item_sampling_quantity,
epi.sampling_programme_no,
epi.sampling_level_no,
epi.default_sampling_proportion,
epi.collection_flag,
epi.collection_source,
epi.collection_method,
CASE WHEN epi.collection_method = 'plc' THEN 'PLC'
WHEN epi.collection_method = 'file' THEN '文件'
WHEN epi.collection_method = 'image' THEN '图片'
else '' end as collectionMethodDesc,
epi.collection_condition,
epi.collection_data_content
FROM eam_properties_item as epi
LEFT JOIN qc_method_item as qmi on epi.ItemNo = qmi.ItemNo and epi.site = qmi.site and epi.bu_no = qmi.bu_no
LEFT JOIN qc_method as qm on qmi.method_no = qm.method_no and qmi.site = qm.site and qmi.bu_no = qm.bu_no
<where>
epi.site = #{data.site} and epi.ItemNo = #{data.itemNo} and epi.bu_no = #{data.buNo}
</where>
</select>
<select id="eamWorkOrderSearchList" resultType="com.xujie.sys.modules.pms.data.EamMaintainOrderExportData"> <select id="eamWorkOrderSearchList" resultType="com.xujie.sys.modules.pms.data.EamMaintainOrderExportData">
SELECT SELECT
a.Site, a.Site,
@ -4294,7 +4341,6 @@
</where> </where>
ORDER BY a.CreateDate ORDER BY a.CreateDate
</select> </select>
<insert id="saveSoundBoxEmailLog" parameterType="com.xujie.sys.modules.pms.entity.SoundBoxEmailLog"> <insert id="saveSoundBoxEmailLog" parameterType="com.xujie.sys.modules.pms.entity.SoundBoxEmailLog">
insert into sound_box_email_log (site, component_part_no, notify_no, request_data, response_data, email, created_at, user_id, username) insert into sound_box_email_log (site, component_part_no, notify_no, request_data, response_data, email, created_at, user_id, username)
values (#{site}, #{componentPartNo}, #{notifyNo}, #{requestData}, #{responseData}, #{email}, #{createdAt}, #{userId}, #{username}) values (#{site}, #{componentPartNo}, #{notifyNo}, #{requestData}, #{responseData}, #{email}, #{createdAt}, #{userId}, #{username})

Loading…
Cancel
Save