2025-07-01 添加设备维修保养的设备名称合型号字段

liyong

昨天 beb0fc04f59f4f448e70d8de9ae39161632de2fb

2025-07-01 添加设备维修保养的设备名称合型号字段

 doc/add.sql

@@ -74,3 +74,11 @@
alter table product_record
    add 列_name int null comment 'sale_ledger_projectI_id';

# 添加设备名称和规格型号
ALTER TABLE `product-inventory-management`.`device_repair`
    ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
    ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;

ALTER TABLE `product-inventory-management`.`device_maintenance`
    ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
    ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;

 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java

@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -27,6 +29,9 @@
    @Autowired
    private IDeviceMaintenanceService deviceMaintenanceService;

    @Autowired
    private IDeviceLedgerService deviceLedgerService;

    @ApiModelProperty("设备保养列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -36,6 +41,9 @@
    @PostMapping()
    @ApiModelProperty("添加设备保养")
    public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
        deviceMaintenance.setDeviceName(byId.getDeviceName());
        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
        return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
    }

@@ -48,6 +56,9 @@
    @PutMapping ()
    @ApiModelProperty("修改设备保养")
    public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
        deviceMaintenance.setDeviceName(byId.getDeviceName());
        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
    }


 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -25,6 +25,9 @@
    @Autowired
    private IDeviceRepairService deviceRepairService;

    @Autowired
    private IDeviceLedgerService deviceLedgerService;

    @ApiModelProperty("设备报修列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
@@ -34,6 +37,9 @@
    @PostMapping()
    @ApiModelProperty("添加设备报修")
    public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        deviceRepair.setDeviceName(byId.getDeviceName());
        deviceRepair.setDeviceModel(byId.getDeviceModel());
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    }


 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -22,6 +22,11 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;


    private String deviceName;

    private String deviceModel;

    @ApiModelProperty("计划保养日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -25,6 +25,10 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    private String deviceName;

    private String deviceModel;

    @ApiModelProperty("报修时间")
    private Date repairTime;