From 522b9cd4cd7f38f88fe77cb9b9f2c5f7197eed29 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 10:06:09 +0800
Subject: [PATCH] 增加领用记录列表接口，维修后生成领用记录
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 3 ++-
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java | 9 ++++++++-
src/main/resources/mapper/measuringinstrumentledger/SparePartsRequisitionRecordMapper.xml | 6 +++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index a2c3ee4..da9486a 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -141,6 +141,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
+ DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
List<Long> sparePartIds = new ArrayList<>();
@@ -159,7 +160,7 @@
SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
record.setSourceType(0); // 0 缁翠慨
record.setSourceId(deviceRepair.getId());
- record.setDeviceLedgerId(deviceRepair.getDeviceLedgerId());
+ record.setDeviceLedgerId(oldDeviceRepair.getDeviceLedgerId());
record.setSparePartsId(sparePartUse.getId());
record.setQuantity(sparePartUse.getQuantity());
sparePartsRequisitionRecordService.save(record);
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
index ba2f40b..158b01d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
@@ -7,10 +7,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -48,7 +51,7 @@
@ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
@@ -56,9 +59,13 @@
@ApiModelProperty("褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}
diff --git a/src/main/resources/mapper/measuringinstrumentledger/SparePartsRequisitionRecordMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/SparePartsRequisitionRecordMapper.xml
index 2a4d5eb..9851e59 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/SparePartsRequisitionRecordMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/SparePartsRequisitionRecordMapper.xml
@@ -18,11 +18,11 @@
<select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsRequisitionRecordDto">
- select sprr.*,sp.name as sparePartName, dl.name as deviceLedgerName, su.nick_name as operator
+ select sprr.*,sp.name as sparePartsName, dl.device_name as deviceName, su.nick_name as operator
from spare_parts_requisition_record sprr
- left join spare_parts sp on sp.id = sprr.spare_part_id
+ left join spare_parts sp on sp.id = sprr.spare_parts_id
left join device_ledger dl on dl.id = sprr.device_ledger_id
- left join sys_user su on su.id = sprr.create_user
+ left join sys_user su on su.user_id = sprr.create_user
<where>
<if test="params.sparePartsName != null and params.sparePartsName != ''">
and sp.name like concat('%',#{params.sparePartsName},'%')
--
Gitblit v1.9.3