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 | 84 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 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 5ec91bd..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,19 +3,25 @@
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;
import org.jeecg.modules.cms.entity.CuttingReceive;
import org.jeecg.modules.cms.entity.CuttingReceiveDetail;
+import org.jeecg.modules.cms.entity.RatedLife;
import org.jeecg.modules.cms.mapper.CuttingReceiveMapper;
import org.jeecg.modules.cms.service.ICuttingInventoryService;
import org.jeecg.modules.cms.service.ICuttingReceiveDetailService;
import org.jeecg.modules.cms.service.ICuttingReceiveService;
+import org.jeecg.modules.cms.service.IRatedLifeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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;
@@ -33,6 +39,8 @@
private ICuttingInventoryService cuttingInventoryService;
@Autowired
private ICuttingReceiveDetailService cuttingReceiveDetailService;
+ @Autowired
+ private IRatedLifeService ratedLifeService;
@Override
public IPage<Map<String, Object>> getInventoryToolList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
@@ -88,4 +96,80 @@
return Result.error("鎻愪氦澶辫触: " + e.getMessage());
}
}
+
+
+ @Override
+ public synchronized Result<?> handleBack(String orderId) {
+ //FIXME锛氬垁鍏峰綊杩� 鐩墠璁捐鐨勬槸浠ラ鐢ㄥ崟涓虹淮搴﹁繘琛岃繕搴擄紱鑻ユ槸闇�瑕佷互鍒�鍏蜂负缁村害杩涜褰掕繕鐨勫垯闇�瑕佸彟琛岃璁�
+ long startTime = System.currentTimeMillis();
+ try {
+ // 1. 鏇存柊棰嗙敤鍗曠姸鎬佷负宸插綊杩�
+ CuttingReceive cuttingReceive = this.getById(orderId);
+ if (cuttingReceive == null) {
+ return Result.error("鏈壘鍒板搴旂殑棰嗙敤鍗�");
+ }
+
+ // 妫�鏌ラ鐢ㄥ崟鐘舵�侊紝鍙厑璁哥姸鎬佷负"宸查鐢�"鐨勯鐢ㄥ崟杩涜褰掕繕鎿嶄綔
+ if (!"2".equals(cuttingReceive.getOrderStatus())) {
+ return Result.error("鍙湁鐘舵�佷负宸查鐢ㄧ殑棰嗙敤鍗曟墠鑳芥墽琛屽綊杩樻搷浣�");
+ }
+
+ cuttingReceive.setOrderStatus("3"); // 璁剧疆涓哄凡褰掕繕鐘舵��
+ boolean updateResult = this.updateById(cuttingReceive);
+ if (!updateResult) {
+ return Result.error("鏇存柊棰嗙敤鍗曠姸鎬佸け璐ワ紝鍙兘宸茶鍏朵粬鐢ㄦ埛澶勭悊");
+ }
+
+ // 2. 鑾峰彇棰嗙敤鏄庣粏
+ List<CuttingReceiveDetail> detailList = cuttingReceiveDetailService.lambdaQuery()
+ .eq(CuttingReceiveDetail::getOrderId, orderId)
+ .list();
+
+ // 3. 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
+ List<String> inventoryIds = new ArrayList<>();
+ for (CuttingReceiveDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ inventoryIds.add(detail.getInventoryId());
+ }
+ }
+
+ // 4. 瀵垮懡鎵ｅ噺
+ for (CuttingReceiveDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ CuttingReceiveDetail cuttingReceiveDetail = cuttingReceiveDetailService.getById(detail.getInventoryId());
+ CuttingInventory inventory = cuttingInventoryService.getById(detail.getInventoryId());
+
+ RatedLife ratedLife = ratedLifeService.lambdaQuery()
+ .eq(RatedLife::getCuttingId, detail.getCuttingId())
+ .eq(RatedLife::getWorkpieceMaterial, detail.getWorkpieceMaterial())
+ .one();//棰濆畾瀵垮懡
+
+ Integer useLife = detail.getUsedLife();//浣跨敤瀵垮懡
+ //浼樺寲锛�(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("褰掕繕鎴愬姛");
+
+ } catch (Exception e) {
+ long endTime = System.currentTimeMillis();
+ log.error("澶勭悊褰掕繕澶辫触锛宱rderId: " + orderId + "锛岃�楁椂: " + (endTime - startTime) + " ms", e);
+ return Result.error("褰掕繕澶辫触: " + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3