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/CuttingScrapServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingScrapServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingScrapServiceImpl.java
index 7dd15e8..fb54435 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingScrapServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingScrapServiceImpl.java
@@ -2,13 +2,22 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.cms.entity.CuttingScrap;
+import io.micrometer.core.annotation.Timed;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.cms.entity.*;
import org.jeecg.modules.cms.mapper.CuttingScrapMapper;
+import org.jeecg.modules.cms.service.ICuttingInventoryService;
+import org.jeecg.modules.cms.service.ICuttingScrapDetailService;
import org.jeecg.modules.cms.service.ICuttingScrapService;
+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.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -17,12 +26,70 @@
* @Date: 2025-07-28
* @Version: V1.0
*/
+@Slf4j
@Service
public class CuttingScrapServiceImpl extends ServiceImpl<CuttingScrapMapper, CuttingScrap> implements ICuttingScrapService {
+
+ @Autowired
+ private ICuttingScrapDetailService cuttingScarpDetailService;
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
+
@Override
public IPage<Map<String, Object>> getInventoryToolList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
return super.getBaseMapper().getInventoryToolList(pageData,params);
}
+ @Override
+ @Timed(value = "cutting.scrap.submit", description = "鍒�鍏烽鐢ㄦ彁浜よ�楁椂")
+ public synchronized Result<?> submit(String orderId) {
+ long startTime = System.currentTimeMillis();
+ try {
+ // 1. 鏇存柊棰嗙敤鍗曠姸鎬�
+ CuttingScrap cuttingScrap = this.getById(orderId);
+ if (cuttingScrap == null) {
+ return Result.error("鏈壘鍒板搴旂殑棰嗙敤鍗�");
+ }
+
+ // 妫�鏌ラ鐢ㄥ崟鐘舵�侊紝鍙厑璁哥姸鎬佷负"1"鐨勯鐢ㄥ崟鎻愪氦
+ if (!"1".equals(cuttingScrap.getOrderStatus())) {
+ return Result.error("鍙湁鐘舵�佷负鏈彁浜ょ殑棰嗙敤鍗曟墠鑳芥墽琛屾彁浜ゆ搷浣�");
+ }
+
+ cuttingScrap.setOrderStatus("2"); // 鎶ュ簾鐢宠鍗曞彉涓� 宸叉彁浜� 鐘舵��
+ boolean updateResult = this.updateById(cuttingScrap);
+ if (!updateResult) {
+ return Result.error("鏇存柊棰嗙敤鍗曠姸鎬佸け璐ワ紝鍙兘宸茶鍏朵粬鐢ㄦ埛澶勭悊");
+ }
+
+ // 2. 鑾峰彇棰嗙敤鏄庣粏
+ List<CuttingScrapDetail> detailList = cuttingScarpDetailService.lambdaQuery()
+ .eq(CuttingScrapDetail::getOrderId, orderId)
+ .list();
+
+ // 3. 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
+ List<String> inventoryIds = new ArrayList<>();
+ for (CuttingScrapDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ inventoryIds.add(detail.getInventoryId());
+ }
+ }
+
+ // 4. 鎵归噺鏇存柊搴撳瓨鐘舵�佷负"宸叉姤搴�"
+ 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("鎻愪氦棰嗙敤鍗曞け璐ワ紝orderId: " + orderId + "锛岃�楁椂: " + (endTime - startTime) + " ms", e);
+ return Result.error("鎻愪氦澶辫触: " + e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3