From ac225bd66eb7c21b5af1d8533dc59376ea53da6c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 8e410c2..67265c9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -1171,7 +1171,6 @@
materialInventoryMapper.insertMaterialOutbound(materialOutbound, oddNumber);
log.setFunction("saveMaterialOutbound鏂板:"+oddNumber);
}
-
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!materialOutboundDetailList.isEmpty()) {
@@ -1230,10 +1229,6 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
return "false1";
}
-
-
-
-
}
}
@@ -1309,20 +1304,16 @@
}
public Object appGetStockList() {
- ExecutorService executor = Executors.newFixedThreadPool(2);
- AtomicReference<List<MaterialInventory>> materialInventoryList = new AtomicReference<>(new ArrayList<MaterialInventory>());
- executor.execute(() -> {
- materialInventoryList.set(materialInventoryMapper.selectGetStockList());
- });
- List<Object> list = new ArrayList<>();
- executor.shutdown();
+ //ExecutorService executor = Executors.newFixedThreadPool(2);
+ List<MaterialInventory> materialInventoryList = materialInventoryMapper.selectGetStockList();
+ //executor.shutdown();
Map<String, Object> totalSum = new HashMap<>();
Integer inventoryQuantity = 0;
Integer availableQuantity = 0;
Double totalArea = 0.00;
- for (MaterialInventory materialInventory : materialInventoryList.get()) {
+ for (MaterialInventory materialInventory : materialInventoryList) {
inventoryQuantity += materialInventory.getInventoryQuantity();
availableQuantity += materialInventory.getAvailableQuantity();
totalArea += materialInventory.getTotalArea();
--
Gitblit v1.8.0