feat(dms): 新增machineId字段并优化巡检路由逻辑

- 在DmsInspectRouteDetail实体中新增machineId字段及对应getter/setter方法
- 更新数据库映射文件，增加machineId字段的映射配置- 修改SQL查询语句，支持machineId字段的读取与写入
-优化insert和update操作，自动填充machineId字段以满足非空约束- 调整关联查询逻辑，使用machineId替代原有deviceId进行设备关联

aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java

@@ -31,6 +31,9 @@ public class DmsInspectRouteDetail extends DmsBaseEntity
     @Excel(name = "巡检设备ID，关联dms_base_device_ledger的device_id")
     private Long deviceId;
 
+    /** 车间绑定设备ID，关联base_deviceledger.obj_id */
+    private Long machineId;
+
     /** 巡检标准 */
     @Excel(name = "巡检标准")
     private String inspectStandard;
@@ -95,6 +98,14 @@ public class DmsInspectRouteDetail extends DmsBaseEntity
     {
         return deviceId;
     }
+
+    public Long getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(Long machineId) {
+        this.machineId = machineId;
+    }
     public void setInspectStandard(String inspectStandard)
     {
         this.inspectStandard = inspectStandard;
@@ -121,6 +132,7 @@ public class DmsInspectRouteDetail extends DmsBaseEntity
             .append("inspectRouteId", getInspectRouteId())
             .append("lineStep", getLineStep())
             .append("deviceId", getDeviceId())
+            .append("machineId", getMachineId())
             .append("inspectStandard", getInspectStandard())
             .append("isFlag", getIsFlag())
             .append("remark", getRemark())

aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java

@@ -57,6 +57,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
     @Override
     public int insertDmsInspectRouteDetail(DmsInspectRouteDetail dmsInspectRouteDetail)
     {
+        fillMachineIdIfAbsent(dmsInspectRouteDetail);
         return dmsInspectRouteDetailMapper.insertDmsInspectRouteDetail(dmsInspectRouteDetail);
     }
 
@@ -69,6 +70,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
     @Override
     public int updateDmsInspectRouteDetail(DmsInspectRouteDetail dmsInspectRouteDetail)
     {
+        fillMachineIdIfAbsent(dmsInspectRouteDetail);
         return dmsInspectRouteDetailMapper.updateDmsInspectRouteDetail(dmsInspectRouteDetail);
     }
 
@@ -100,4 +102,16 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
     public List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId) {
         return dmsInspectRouteDetailMapper.selectInspectRouteListByInspectRouteId(inspectRouteId);
     }
+
+    /**
+     * 巡检线路明细前置校准：machineId 为空时回填 deviceId，确保满足数据库非空约束。
+     */
+    private void fillMachineIdIfAbsent(DmsInspectRouteDetail dmsInspectRouteDetail) {
+        if (dmsInspectRouteDetail == null) {
+            return;
+        }
+        if (dmsInspectRouteDetail.getMachineId() == null && dmsInspectRouteDetail.getDeviceId() != null) {
+            dmsInspectRouteDetail.setMachineId(dmsInspectRouteDetail.getDeviceId());
+        }
+    }
 }

aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inspectRouteId"    column="inspect_route_id"    />
         <result property="lineStep"    column="line_step"    />
         <result property="deviceId"    column="device_id"    />
+        <result property="machineId"    column="machine_id"    />
         <result property="inspectStandard"    column="inspect_standard"    />
         <result property="isFlag"    column="is_flag"    />
         <result property="remark"    column="remark"    />
@@ -17,7 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsInspectRouteDetailVo">
-        select route_detail_id, inspect_route_id, line_step, device_id, inspect_standard, is_flag, remark from dms_inspect_route_detail
+        select route_detail_id,
+               inspect_route_id,
+               line_step,
+               machine_id as device_id,
+               machine_id,
+               inspect_standard,
+               is_flag,
+               remark
+        from dms_inspect_route_detail
     </sql>
 
     <select id="selectDmsInspectRouteDetailList" parameterType="DmsInspectRouteDetail" resultMap="DmsInspectRouteDetailResult">
@@ -46,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectRouteId != null">inspect_route_id,</if>
             <if test="lineStep != null">line_step,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="machineId != null">machine_id,</if>
             <if test="inspectStandard != null">inspect_standard,</if>
             <if test="isFlag != null and isFlag != ''">is_flag,</if>
             <if test="remark != null">remark,</if>
@@ -55,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectRouteId != null">#{inspectRouteId,jdbcType=NUMERIC},</if>
             <if test="lineStep != null">#{lineStep,jdbcType=NUMERIC},</if>
             <if test="deviceId != null">#{deviceId,jdbcType=NUMERIC},</if>
+            <if test="machineId != null">#{machineId,jdbcType=NUMERIC},</if>
             <if test="inspectStandard != null">#{inspectStandard},</if>
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
@@ -67,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectRouteId != null">inspect_route_id = #{inspectRouteId},</if>
             <if test="lineStep != null">line_step = #{lineStep},</if>
             <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="machineId != null">machine_id = #{machineId},</if>
             <if test="inspectStandard != null">inspect_standard = #{inspectStandard},</if>
             <if test="isFlag != null and isFlag != ''">is_flag = #{isFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -86,10 +98,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectInspectRouteListByInspectRouteId" parameterType="Long" resultMap="DmsInspectRouteDetailResult">
-     select a.route_detail_id, a.inspect_route_id, a.line_step, a.device_id, a.inspect_standard,
+     select a.route_detail_id, a.inspect_route_id, a.line_step, a.machine_id as device_id, a.machine_id, a.inspect_standard,
      a.is_flag, a.remark,b.device_name,c.standard_name
      from dms_inspect_route_detail a
-     left join base_deviceledger b on a.device_id = b.OBJ_ID
+     left join base_deviceledger b on a.machine_id = b.OBJ_ID
      left join dms_base_inspect_standard c on a.inspect_standard = c.inspect_standard_id
     where a.inspect_route_id = #{inspectRouteId}
     </select>