From f99e7de6d1ed98913398fc5a725ba83b1c5a007d Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期一, 15 九月 2025 18:06:46 +0800
Subject: [PATCH] feat(cms): 更新刀具库存状态管理
---
src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
index 8c84412..1d4790b 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
@@ -19,6 +19,7 @@
import org.jeecg.modules.cms.entity.CuttingReceiveDetail;
import org.jeecg.modules.cms.entity.CuttingScrap;
import org.jeecg.modules.cms.entity.CuttingScrapDetail;
+import org.jeecg.modules.cms.service.ICuttingInventoryService;
import org.jeecg.modules.cms.service.ICuttingScrapDetailService;
import org.jeecg.modules.cms.service.ICuttingScrapService;
@@ -59,6 +60,9 @@
@Autowired
private ICuttingScrapDetailService cuttingScrapDetailService;
+
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -106,6 +110,20 @@
for (CuttingScrapDetail temp : list) {
temp.setOrderId(cuttingScrap.getId());
cuttingScrapDetailService.save(temp);
+ }
+
+ // 鏇存柊搴撳瓨鍒�鍏风姸鎬佷负"宸插嚭搴�"
+ if (!list.isEmpty()) {
+ // 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
+ List<String> inventoryIds = list.stream()
+ .map(CuttingScrapDetail::getInventoryId) // 鍋囪CuttingScrapDetail涓湁inventoryId瀛楁
+ .filter(id -> id != null && !id.isEmpty())
+ .collect(Collectors.toList());
+
+ if (!inventoryIds.isEmpty()) {
+ // 鏇存柊搴撳瓨鐘舵�佷负"宸插嚭搴�"
+ cuttingInventoryService.updateStatus(inventoryIds, "寰呮姤搴�");
+ }
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -209,4 +227,15 @@
return Result.ok(list);
}
+ /**
+ * 閫夋嫨鎶ュ簾鍒�鍏风殑鍒楄〃
+ */
+ @GetMapping("/getInventoryToolList")
+ public Result<?> getInventoryToolList(@RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> inventoryTooList = cuttingScrapService.getInventoryToolList(pageNo, pageSize, params);
+ return Result.ok(inventoryTooList);
+ }
+
}
--
Gitblit v1.9.3