Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

19 小时以前 2cc19f8033348f34df382d27f63810b2d6f56a05

Merge remote-tracking branch 'origin/dev_New' into dev_New

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
package com.ruoyi.device.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@RestController
@RequestMapping("/maintenanceTaskFile")
@Api(tags = "设备保养附件")
public class DeviceMaintenanceFileController {

    @Resource
    private DeviceMaintenanceFileService deviceMaintenanceFileService;


    /**
     * æ–°å¢ž
     * @param deviceMaintenanceFile
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
    }

    /**
     * åˆ é™¤
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
    }

    /**
     *分页查询
     * @param page
     * @param deviceMaintenanceFile
     * @return
     */
    @GetMapping("/listPage")
    public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
    }


}

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

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java

ÎļþÃû´Ó src/main/java/com/ruoyi/device/mapper/MaintenanceTaskFileMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.ruoyi.device.mapper;

import com.ruoyi.device.pojo.MaintenanceTaskFile;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

@@ -13,6 +13,6 @@
 * @since 2026-01-27 09:48:09
 */
@Mapper
public interface MaintenanceTaskFileMapper extends BaseMapper<MaintenanceTaskFile> {
public interface DeviceMaintenanceFileMapper extends BaseMapper<DeviceMaintenanceFile> {

}

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

ÎļþÃû´Ó src/main/java/com/ruoyi/device/pojo/MaintenanceTaskFile.java ÐÞ¸Ä
@@ -22,9 +22,9 @@
 */
@Getter
@Setter
@TableName("maintenance_task_file")
@ApiModel(value = "MaintenanceTaskFile对象", description = "设备保养附件")
public class MaintenanceTaskFile implements Serializable {
@TableName("device_maintenance_file")
@ApiModel(value = "DeviceMaintenanceFile对象", description = "设备保养记录附件")
public class DeviceMaintenanceFile implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -40,8 +40,8 @@
    @ApiModelProperty("文件大小")
    private Integer fileSize;

    @ApiModelProperty("设备保养ID")
    private Integer maintenanceTaskId;
    @ApiModelProperty("设备保养记录ID")
    private Integer deviceMaintenanceId;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)

 src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java

ÎļþÃû´Ó src/main/java/com/ruoyi/device/service/MaintenanceTaskFileService.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.ruoyi.device.service;

import com.ruoyi.device.pojo.MaintenanceTaskFile;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.baomidou.mybatisplus.extension.service.IService;

/**
@@ -11,6 +11,6 @@
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
public interface MaintenanceTaskFileService extends IService<MaintenanceTaskFile> {
public interface DeviceMaintenanceFileService extends IService<DeviceMaintenanceFile> {

}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.device.service.impl;

import com.ruoyi.device.mapper.DeviceMaintenanceFileMapper;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@Service
public class DeviceMaintenanceFileServiceImpl extends ServiceImpl<DeviceMaintenanceFileMapper, DeviceMaintenanceFile> implements DeviceMaintenanceFileService {

}

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskFileServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java

@@ -189,6 +189,14 @@
    }

    /**
     * æŸ¥è¯¢é‡‡è´­å°è´¦å’Œäº§å“çˆ¶å­åˆ—表
     */
    @GetMapping("/getPurchaseByCode")
    public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
        return purchaseLedgerService.getPurchaseByCode(purchaseLedgerDto);
    }

    /**
     * åˆ é™¤é‡‡è´­å°è´¦
     */
    @Log(title = "采购台账", businessType = BusinessType.DELETE)

 src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java

@@ -43,4 +43,6 @@
    String getPurchaseNo();

    AjaxResult importData(MultipartFile file);

    PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -163,6 +163,7 @@
        purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
        purchaseLedger.setRecorderName(sysUser.getNickName());
        purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
        purchaseLedger.setApprovalStatus(1);
        // 3. æ–°å¢žæˆ–更新主表
        if (purchaseLedger.getId() == null) {
            purchaseLedgerMapper.insert(purchaseLedger);
@@ -724,6 +725,32 @@
        return AjaxResult.success("导入失败");
    }

    @Override
    public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
        // 1. æŸ¥è¯¢ä¸»è¡¨
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
                .eq(PurchaseLedger::getPurchaseContractNumber, purchaseLedgerDto.getPurchaseContractNumber())
                .last("LIMIT 1"));
        if (purchaseLedger == null) {
            throw new BaseException("采购台账不存在");
        }

        // 2. æŸ¥è¯¢å­è¡¨
        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                .eq(SalesLedgerProduct::getType, 2);
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);

        // 4. è½¬æ¢ DTO
        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
        BeanUtils.copyProperties(purchaseLedger, resultDto);
        if (!products.isEmpty()) {
            resultDto.setHasChildren(true);
            resultDto.setProductData(products);
        }
        return resultDto;
    }

    public void addApproveByPurchase(LoginUser loginUser,PurchaseLedger purchaseLedger) throws Exception {
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(5);

 src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java

@@ -37,7 +37,7 @@
    @ApiModelProperty(value = "销售报价产品表id")
    private Long salesLedgerProductId;

    @ApiModelProperty(value = "状态 å¾…审核 å®¡æ ¸ä¸­ ï¼Œå®¡æ ¸æ‹’绝 å®¡æ ¸é€šè¿‡")
    @ApiModelProperty(value = "状态 å¾…审核 å®¡æ ¸ä¸­ ï¼Œå®¡æ ¸æ‹’绝 å®¡æ ¸é€šè¿‡ å·²å‘è´§")
    @Excel(name = "状态")
    private String status;


 src/main/resources/mapper/device/MaintenanceTaskFileMapper.xml

ÎļþÒÑɾ³ý