DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
砂糖
2026-07-03 15:37:47 +08:00
parent a671e1ee5f b3da00e2e7
commit 00f5abc0db
6 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java
View File

@@ -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;
/**
* 产线名称
*/

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

@@ -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;
/**
* 产线名称
*/

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

@@ -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;
/**
* 产线名称
*/

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

@@ -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());

2
klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml
View File

@@ -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"/>

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

@@ -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,