From 29ccd9919082e0157f57989ae83b303f314bad6b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 08 六月 2026 16:01:55 +0800
Subject: [PATCH] feat(financial): 新增凭证分录科目明细字段
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 2096b6d..bf57927 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -1,15 +1,22 @@
package com.ruoyi.stock.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.http.service.impl.RealTimeEnergyConsumptionServiceImpl;
import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.dto.StockIotRealtimeDto;
import com.ruoyi.stock.execl.StockInventoryExportData;
+import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.stock.service.StockInventoryService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -18,8 +25,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -36,6 +43,8 @@
public class StockInventoryController {
private StockInventoryService stockInventoryService;
+ private IDeviceLedgerService deviceLedgerService;
+ private RealTimeEnergyConsumptionServiceImpl realTimeEnergyConsumptionService;
@GetMapping("/pagestockInventory")
@Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
@@ -48,6 +57,19 @@
@Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+ return R.ok(stockInventoryDtoIPage);
+ }
+
+ /**
+ * 鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�
+ * @param page
+ * @param stockInventoryDto
+ * @return
+ */
+ @GetMapping("/getBatchNoQty")
+ @Operation(summary = "鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�")
+ public R getBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.getBatchNoQty(page, stockInventoryDto);
return R.ok(stockInventoryDtoIPage);
}
@@ -85,7 +107,7 @@
}
- @PostMapping("importStockInventory")
+ @PostMapping("/importStockInventory")
@Operation(summary = "瀵煎叆搴撳瓨")
public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
@@ -105,13 +127,13 @@
stockInventoryService.exportStockInventory(response, stockInventoryDto);
}
- @GetMapping("stockInventoryPage")
+ @GetMapping("/stockInventoryPage")
@Operation(summary = "搴撳瓨鎶ヨ〃鏌ヨ")
public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
}
- @GetMapping("stockInAndOutRecord")
+ @GetMapping("/stockInAndOutRecord")
@Operation(summary = "缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
@@ -128,4 +150,57 @@
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.thawStock(stockInventoryDto));
}
+
+ @GetMapping("/getByModelId")
+ @Operation(summary = "鏍规嵁浜у搧瑙勬牸ID鑾峰彇鍏ュ簱璁板綍")
+ public R getByModelId(Long productModelId) {
+ return R.ok(stockInventoryService.getByModelId(productModelId));
+ }
+
+ @PostMapping("/iotRealtime")
+ @Operation(summary = "鑾峰彇搴撳瓨缁戝畾鐨勭墿鑱旇澶囧疄鏃舵暟閲囨暟鎹�")
+ @Log(title = "搴撳瓨鐗╄仈璁惧瀹炴椂鏁伴噰", businessType = BusinessType.OTHER)
+ public R iotRealtime(@RequestBody List<Long> ids) {
+
+ StockIotRealtimeDto result = new StockIotRealtimeDto();
+
+ if (ids.isEmpty()) {
+ result.setDevices(Collections.emptyList());
+ return R.ok(result);
+ }
+
+ List<DeviceLedger> devices = deviceLedgerService.listByIds(ids);
+ List<String> guidList = devices.stream()
+ .map(DeviceLedger::getExternalCode)
+ .filter(StringUtils::isNotEmpty)
+ .collect(Collectors.toList());
+
+ Map<String, Map<String, String>> realTimeDataMap = new HashMap<>();
+ if (!guidList.isEmpty()) {
+ List<Map<String, String>> realTimeList = realTimeEnergyConsumptionService.getRealData(guidList);
+ for (Map<String, String> item : realTimeList) {
+ String guid = item.get("guid");
+ if (StringUtils.isNotEmpty(guid)) {
+ realTimeDataMap.put(guid.trim(), item);
+ }
+ }
+ }
+
+ List<Map<String, String>> deviceDataList = devices.stream().map(device -> {
+ Map<String, String> data = new LinkedHashMap<>();
+ data.put("deviceId", String.valueOf(device.getId()));
+ data.put("deviceName", device.getDeviceName() != null ? device.getDeviceName() : "");
+ data.put("deviceModel", device.getDeviceModel() != null ? device.getDeviceModel() : "");
+ data.put("externalCode", device.getExternalCode() != null ? device.getExternalCode() : "");
+ data.put("storageLocation", device.getStorageLocation() != null ? device.getStorageLocation() : "");
+ Map<String, String> rt = realTimeDataMap.getOrDefault(
+ device.getExternalCode() != null ? device.getExternalCode().trim() : "",
+ Collections.emptyMap());
+ data.putAll(rt);
+ return data;
+ }).collect(Collectors.toList());
+
+ result.setDevices(deviceDataList);
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.3