From 4f38e5827b848298de8e95f59e0ba9b24951e615 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期二, 16 九月 2025 18:01:18 +0800
Subject: [PATCH] refactor(cms): 优化刀具管理功能和性能 刀具报废功能 - 新增 提交（/subumit）接口 刀具报废功能 - 修改完善其删除功能，同时删除报废单和报废明细 刀具报废功能 - （/add）接口中增加逻辑判断禁制同一个刀具重复申请报废 刀具领用功能 - 完善刀具寿命计算 刀具领用功能 - 完善其删除功能，同时删除领用单和领用明细 刀具入库功能 - 完善其删除功能，同时删除入库单和入库明细 把刀具库存中的库存状态，从“正常”改为“在库”。
---
src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
index 69edf6b..dd1cf54 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.micrometer.core.annotation.Timed;
+import liquibase.pro.packaged.C;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInventory;
@@ -20,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -95,8 +97,10 @@
}
}
+
@Override
public synchronized Result<?> handleBack(String orderId) {
+ //FIXME锛氬垁鍏峰綊杩� 鐩墠璁捐鐨勬槸浠ラ鐢ㄥ崟涓虹淮搴﹁繘琛岃繕搴擄紱鑻ユ槸闇�瑕佷互鍒�鍏蜂负缁村害杩涜褰掕繕鐨勫垯闇�瑕佸彟琛岃璁�
long startTime = System.currentTimeMillis();
try {
// 1. 鏇存柊棰嗙敤鍗曠姸鎬佷负宸插綊杩�
@@ -129,32 +133,35 @@
}
}
- // 4. 鎵归噺鏇存柊搴撳瓨鐘舵�佷负"姝ｅ父"
- if (!inventoryIds.isEmpty()) {
- cuttingInventoryService.updateStatus(inventoryIds, "姝ｅ父");
- }
- // 5. 瀵垮懡鎵ｅ噺
+ // 4. 瀵垮懡鎵ｅ噺
for (CuttingReceiveDetail detail : detailList) {
if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ CuttingReceiveDetail cuttingReceiveDetail = cuttingReceiveDetailService.getById(detail.getInventoryId());
CuttingInventory inventory = cuttingInventoryService.getById(detail.getInventoryId());
- //FIXME:ratedLife绌烘寚閽�
- RatedLife ratedLife = ratedLifeService.lambdaQuery() //棰濆畾瀵垮懡
- .eq(RatedLife::getCuttingId, inventory.getCuttingId())
- .eq(RatedLife::getWorkpieceMaterial, inventory.getWorkpieceMaterial())
- .one();
- BigDecimal currentLife = inventory.getCurrentLife().divide(BigDecimal.valueOf(100),java.math.RoundingMode.HALF_UP);//褰撳墠瀵垮懡鐧惧垎姣�
+ RatedLife ratedLife = ratedLifeService.lambdaQuery()
+ .eq(RatedLife::getCuttingId, detail.getCuttingId())
+ .eq(RatedLife::getWorkpieceMaterial, detail.getWorkpieceMaterial())
+ .one();//棰濆畾瀵垮懡
+
Integer useLife = detail.getUsedLife();//浣跨敤瀵垮懡
- //璁＄畻鍏紡: (ratedLife * currentLife - useLife) * 100
- BigDecimal newLife = ratedLife.getRatedLife()
- .multiply(currentLife)
- .subtract(BigDecimal.valueOf(useLife))
- .multiply(BigDecimal.valueOf(100));
+ //浼樺寲锛�(1-浣跨敤瀵垮懡/棰濆畾瀵垮懡)*100
+ BigDecimal usageRatio = BigDecimal.valueOf(useLife).divide(ratedLife.getRatedLife(), 4, RoundingMode.HALF_UP);
+ BigDecimal newLife = BigDecimal.valueOf(1)
+ .subtract(usageRatio)
+ .multiply(BigDecimal.valueOf(100))
+ .setScale(2, RoundingMode.HALF_UP);
// 鏇存柊搴撳瓨瀵垮懡
inventory.setCurrentLife(newLife);
cuttingInventoryService.updateById(inventory);
}
}
+
+ // 5. 鎵归噺鏇存柊搴撳瓨鐘舵�佷负"姝ｅ父"
+ if (!inventoryIds.isEmpty()) {
+ cuttingInventoryService.updateStatus(inventoryIds, "鍦ㄥ簱");
+ }
+
long endTime = System.currentTimeMillis();
log.info("鍒�鍏峰綊杩樺鐞嗗畬鎴愶紝鑰楁椂: {} ms", (endTime - startTime));
return Result.ok("褰掕繕鎴愬姛");
--
Gitblit v1.9.3