Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java

@@ -31,14 +31,6 @@ public class EqpMaintenancePlanDetail extends BaseEntity {
      * 维修计划ID
      */
     private Long planId;
-    /**
-     * 巡检记录ID（来源异常工单）
-     */
-    private Long recordId;
-    /**
-     * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id）
-     */
-    private Long equipmentId;
     /**
      * 产线名称
      */

klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java

@@ -30,16 +30,6 @@ public class EqpMaintenancePlanDetailBo extends BaseEntity {
      */
     private Long planId;
 
-    /**
-     * 巡检记录ID（来源异常工单）
-     */
-    private Long recordId;
-
-    /**
-     * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id）
-     */
-    private Long equipmentId;
-
     /**
      * 产线名称
      */

klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java

@@ -34,20 +34,6 @@ public class EqpMaintenancePlanDetailVo {
     @ExcelProperty(value = "维修计划ID")
     private Long planId;
 
-    /**
-     * 巡检记录ID（来源异常工单）
-     */
-    @ExcelProperty(value = "巡检记录ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "来=源异常工单")
-    private Long recordId;
-
-    /**
-     * 设备ID（用户手动选择，关联 eqp_equipment_management.equipment_id）
-     */
-    @ExcelProperty(value = "设备ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "用=户手动选择，关联,e=qp_equipment_management.equipment_id")
-    private Long equipmentId;
-
     /**
      * 产线名称
      */

klp-flow/src/main/java/com/klp/flow/service/impl/EqpMaintenancePlanDetailServiceImpl.java

@@ -62,8 +62,6 @@ public class EqpMaintenancePlanDetailServiceImpl implements IEqpMaintenancePlanD
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<EqpMaintenancePlanDetail> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getPlanId() != null, EqpMaintenancePlanDetail::getPlanId, bo.getPlanId());
-        lqw.eq(bo.getRecordId() != null, EqpMaintenancePlanDetail::getRecordId, bo.getRecordId());
-        lqw.eq(bo.getEquipmentId() != null, EqpMaintenancePlanDetail::getEquipmentId, bo.getEquipmentId());
         lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpMaintenancePlanDetail::getProductionLine, bo.getProductionLine());
         lqw.like(StringUtils.isNotBlank(bo.getComponentName()), EqpMaintenancePlanDetail::getComponentName, bo.getComponentName());
         lqw.eq(bo.getItemPlanDate() != null, EqpMaintenancePlanDetail::getItemPlanDate, bo.getItemPlanDate());

klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml

@@ -7,8 +7,6 @@
     <resultMap type="com.klp.flow.domain.EqpMaintenancePlanDetail" id="EqpMaintenancePlanDetailResult">
         <result property="detailId" column="detail_id"/>
         <result property="planId" column="plan_id"/>
-        <result property="recordId" column="record_id"/>
-        <result property="equipmentId" column="equipment_id"/>
         <result property="productionLine" column="production_line"/>
         <result property="componentName" column="component_name"/>
         <result property="itemPlanDate" column="item_plan_date"/>

klp-ui/src/views/wms/post/eqp/index.vue

@@ -508,7 +508,7 @@ export default {
       var self = this;
       var planId = this.currentRow.planId;
       var addPromises = this.abnormalSelectedRecords.map(function(rec) {
-        return addMaintenancePlanAbnormal({ planId: planId, recordId: rec.recordId });
+        return addMaintenancePlanAbnormal({ planId: planId });
       });
       // Also auto-create detail rows from selected records
       this.$modal.loading("正在关联异常记录并生成维修明细...");
@@ -517,7 +517,6 @@ export default {
         var detailPromises = self.abnormalSelectedRecords.map(function(rec) {
           return addMaintenancePlanDetail({
             planId: planId,
-            recordId: rec.recordId,
             componentName: rec.partName || '',
             productionLine: rec.productionLine || '',
             maintenanceCategory: 1,