From 259a60f240fdfff356a236d380d8d682949fc571 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 09:24:25 +0800
Subject: [PATCH] feat(环保门禁): 巡检设备数据回传开放接口(无人机/机器人/AI摄像头)、无人值守地磅模块(表+后端+日报)、车辆采集照片字段、修复车辆修改接口缺@RequestBody

---
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index c8fedc3..0b60e7a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.handler.CustomTenantLineHandler;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
 import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
@@ -74,12 +75,29 @@
                 .inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
                 .inboundNum(new BigDecimal(procurementRecordOutAdd.getQuantity()))
                 .type(procurementRecordOutAdd.getType())
+                .supplierName(procurementRecordOutAdd.getSupplierName())
                 .createTime(localDateTime == null ? LocalDateTime.now() : localDateTime)
                 .createUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
                 .createBy(sysUser.getNickName())
                 .updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
                 .updateTime(LocalDateTime.now());
-        this.save(procurementRecordOut.build());
+        ProcurementRecordOut saved = procurementRecordOut.build();
+        // 鍑哄簱鍐欏叆鏃朵复鏃惰烦杩囩鎴锋彃浠讹紝閬垮厤 jsqlparser 瑙f瀽寮傚父
+        // 锛圕lassCastException: SetOperationList cannot be cast to PlainSelect锛�
+        // tenant_id 鐢� MybatisHandler 鐨� strictInsertFill 鑷姩濉厖锛屼笉浼氫涪
+        CustomTenantLineHandler.TEMP_IGNORE.set(Boolean.TRUE);
+        try {
+            this.save(saved);
+            if (StringUtils.isNotEmpty(procurementRecordOutAdd.getRequisitionNum()) && saved.getId() != null) {
+                ProcurementRecordOut upd = ProcurementRecordOut.builder()
+                        .id(saved.getId())
+                        .requisitionNum(new BigDecimal(procurementRecordOutAdd.getRequisitionNum()))
+                        .build();
+                procurementRecordOutMapper.updateById(upd);
+            }
+        } finally {
+            CustomTenantLineHandler.TEMP_IGNORE.remove();
+        }
         return 0;
     }
 
@@ -118,4 +136,16 @@
     public IPage<ProcurementRecordOutPageDto> listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
         return procurementRecordOutMapper.listPageByCustom(page, procurementDto);
     }
+
+    @Override
+    public IPage<ProcurementRecordOutPageDto> listPageByPurchaseReturn(Page page, ProcurementRecordOutPageDto procurementDto) {
+        return procurementRecordOutMapper.listPageByPurchaseReturn(page, procurementDto);
+    }
+
+    @Override
+    public void exportPurchaseReturn(HttpServletResponse response) {
+        List<ProcurementRecordOutPageDto> list = procurementRecordOutMapper.listPurchaseReturn();
+        ExcelUtil<ProcurementRecordOutPageDto> util = new ExcelUtil<>(ProcurementRecordOutPageDto.class);
+        util.exportExcel(response, list, "閫�璐у嚭搴撳彴璐�");
+    }
 }

--
Gitblit v1.9.3