DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增产线维度数据隔离与异常挂接功能

Browse Source 
1. 新增全局产线常量配置，统一设置当前产线为双机架
2. 为设备点检、换辊、轧辊管理等接口添加产线过滤逻辑
3. 新增异常记录挂接与撤回功能，完善异常管理流程
4. 重构生产指标、报表接口路径与参数命名
5. 为设备检查表新增产线字段并优化查询逻辑
6. 优化点检页面UI交互与空状态提示
This commit is contained in:
砂糖
2026-06-09 16:10:28 +08:00
parent b09d0a87ad
commit 173f05f723
21 changed files with 255 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentChecklistMapper.xml
View File

@@ -12,6 +12,7 @@
<result property="checkStandard" column="check_standard" />
<result property="responsiblePerson" column="responsible_person" />
<result property="remark" column="remark" />
<result property="productionLine" column="production_line" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -20,29 +21,31 @@
</resultMap>
<sql id="selectEqpChecklistVo">
select check_id, check_no, part_id, part_name, check_content, equipment_state,
check_standard, responsible_person, remark, del_flag,
create_by, create_time, update_by, update_time
from eqp_equipment_checklist
select c.check_id, c.check_no, c.part_id, c.part_name, c.check_content, c.equipment_state,
c.check_standard, c.responsible_person, c.remark, p.production_line, c.del_flag,
c.create_by, c.create_time, c.update_by, c.update_time
from eqp_equipment_checklist c
left join eqp_equipment_part p on c.part_id = p.part_id and p.del_flag = '0'
</sql>
<select id="selectEqpChecklistList" parameterType="com.ruoyi.mill.domain.EqpEquipmentChecklist" resultMap="EqpChecklistResult">
<include refid="selectEqpChecklistVo"/>
<where>
and del_flag = '0'
<if test="checkNo != null and checkNo != ''"> and check_no like concat('%', #{checkNo}, '%')</if>
<if test="partId != null"> and part_id = #{partId}</if>
<if test="partName != null and partName != ''"> and part_name like concat('%', #{partName}, '%')</if>
<if test="equipmentState != null and equipmentState != ''"> and equipment_state = #{equipmentState}</if>
<if test="checkStandard != null and checkStandard != ''"> and check_standard like concat('%', #{checkStandard}, '%')</if>
<if test="responsiblePerson != null and responsiblePerson != ''"> and responsible_person like concat('%', #{responsiblePerson}, '%')</if>
and c.del_flag = '0'
<if test="checkNo != null and checkNo != ''"> and c.check_no like concat('%', #{checkNo}, '%')</if>
<if test="partId != null"> and c.part_id = #{partId}</if>
<if test="partName != null and partName != ''"> and c.part_name like concat('%', #{partName}, '%')</if>
<if test="equipmentState != null and equipmentState != ''"> and c.equipment_state = #{equipmentState}</if>
<if test="checkStandard != null and checkStandard != ''"> and c.check_standard like concat('%', #{checkStandard}, '%')</if>
<if test="responsiblePerson != null and responsiblePerson != ''"> and c.responsible_person like concat('%', #{responsiblePerson}, '%')</if>
<if test="productionLine != null and productionLine != ''"> and p.production_line = #{productionLine}</if>
</where>
order by check_id asc
</select>
<select id="selectEqpChecklistByCheckId" parameterType="Long" resultMap="EqpChecklistResult">
<include refid="selectEqpChecklistVo"/>
where check_id = #{checkId} and del_flag = '0'
where c.check_id = #{checkId} and c.del_flag = '0'
</select>
<insert id="insertEqpChecklist" parameterType="com.ruoyi.mill.domain.EqpEquipmentChecklist" useGeneratedKeys="true" keyProperty="checkId">

8
ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentInspectionRecordMapper.xml
View File

@@ -21,15 +21,17 @@
<result property="checkStandard" column="check_standard" />
<result property="partName" column="part_name" />
<result property="partId" column="part_id" />
<result property="productionLine" column="production_line" />
</resultMap>
<select id="selectEqpInspectionRecordList" parameterType="com.ruoyi.mill.domain.EqpEquipmentInspectionRecord" resultMap="EqpInspectionRecordResult">
select r.record_id, r.check_id, r.shift, r.inspect_time, r.run_status,
r.inspector, r.abnormal_desc, r.photo, r.remark, r.del_flag,
r.create_by, r.create_time, r.update_by, r.update_time,
c.check_content, c.check_standard, c.part_name, c.part_id
c.check_content, c.check_standard, c.part_name, c.part_id, p.production_line
from eqp_equipment_inspection_record r
left join eqp_equipment_checklist c on r.check_id = c.check_id and c.del_flag = '0'
left join eqp_equipment_part p on c.part_id = p.part_id and p.del_flag = '0'
<where>
and r.del_flag = '0'
<if test="checkId != null"> and r.check_id = #{checkId}</if>
@@ -38,6 +40,7 @@
<if test="runStatus != null"> and r.run_status = #{runStatus}</if>
<if test="inspector != null and inspector != ''"> and r.inspector like concat('%', #{inspector}, '%')</if>
<if test="abnormalDesc != null and abnormalDesc != ''"> and r.abnormal_desc like concat('%', #{abnormalDesc}, '%')</if>
<if test="productionLine != null and productionLine != ''"> and p.production_line = #{productionLine}</if>
<if test="startInspectTime != null and startInspectTime != ''"> and r.inspect_time &gt;= #{startInspectTime}</if>
<if test="endInspectTime != null and endInspectTime != ''"> and r.inspect_time &lt;= concat(#{endInspectTime}, ' 23:59:59')</if>
</where>
@@ -48,9 +51,10 @@
select r.record_id, r.check_id, r.shift, r.inspect_time, r.run_status,
r.inspector, r.abnormal_desc, r.photo, r.remark, r.del_flag,
r.create_by, r.create_time, r.update_by, r.update_time,
c.check_content, c.check_standard, c.part_name, c.part_id
c.check_content, c.check_standard, c.part_name, c.part_id, p.production_line
from eqp_equipment_inspection_record r
left join eqp_equipment_checklist c on r.check_id = c.check_id and c.del_flag = '0'
left join eqp_equipment_part p on c.part_id = p.part_id and p.del_flag = '0'
where r.record_id = #{recordId} and r.del_flag = '0'
</select>