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/CuttingInventoryServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
index 7816739..e4ca00f 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
@@ -67,14 +67,13 @@
// 鏂瑰紡1: 鏌ヨ褰撳墠鐘舵�佸苟鏍规嵁鐘舵�佸喅瀹氭仮澶嶅埌鍝釜鐘舵��
List<CuttingInventory> inventoryList = this.listByIds(ids);
List<String> toRestoreIds = inventoryList.stream()
- .filter(inv -> "寰呭嚭搴�".equals(inv.getInventoryStatus())) // 鍙鐞�"寰呭嚭搴�"鐘舵�佺殑
+ .filter(inv -> "寰呭嚭搴�".equals(inv.getInventoryStatus())) // 鍑哄簱鍗曚綔搴熺殑鎯呭喌涓嬶紝鍙細鏈夊緟鍑哄簱閫�鍥炴甯哥姸鎬佺殑鎯呭喌銆�
.map(CuttingInventory::getId)
.collect(Collectors.toList());
- //FIXME:鍦ㄦ姤搴熷墠鏈夊涓姸鎬侊紝濡傛灉鎶ュ簾浣滃簾锛屽垁鍏峰簱瀛樼姸鎬佸浣曢��鍥炲師鏉ョ殑鐘舵�併��
if (!toRestoreIds.isEmpty()) {
UpdateWrapper<CuttingInventory> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", toRestoreIds);
- updateWrapper.set("inventory_status", "姝ｅ父");
+ updateWrapper.set("inventory_status", "鍦ㄥ簱");
updateWrapper.set("update_time", new Date());
updateWrapper.set("update_by", username);
this.update(updateWrapper);
--
Gitblit v1.9.3