From 67ac603f410319a0d999e5f493c8ef2d74163fe1 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:44:47 +0800
Subject: [PATCH] 保养标准：点检标准导入 点检名称修改/ 设备台账导入
---
src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
index 35302fe..8c93b00 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
@@ -103,7 +103,7 @@
temp.setOrderId(cuttingReceive.getId());
cuttingReceiveDetailService.save(temp);
}
- // 鏇存柊搴撳瓨鍒�鍏风姸鎬佷负"宸插嚭搴�"
+ // 鏇存柊搴撳瓨鍒�鍏风姸鎬佷负"寰呭嚭搴�"
if (!list.isEmpty()) {
// 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
List<String> inventoryIds = list.stream()
@@ -112,7 +112,7 @@
.collect(Collectors.toList());
if (!inventoryIds.isEmpty()) {
- // 鏇存柊搴撳瓨鐘舵�佷负"宸插嚭搴�"
+ // 鏇存柊搴撳瓨鐘舵�佷负"寰呭嚭搴�"
cuttingInventoryService.updateStatus(inventoryIds, "寰呭嚭搴�");
}
}
@@ -140,7 +140,25 @@
//@RequiresPermissions("org.jeecg.modules:cms_cutting_receive:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id") String id) {
+ // 鍏堟煡璇㈠嚭棰嗙敤鍗曟槑缁嗭紝鑾峰彇鐩稿叧鐨勫簱瀛業D
+ List<CuttingReceiveDetail> detailList = cuttingReceiveDetailService.lambdaQuery()
+ .eq(CuttingReceiveDetail::getOrderId, id)
+ .list();
+ // 鍒犻櫎棰嗙敤鍗曚富琛ㄥ拰鏄庣粏琛ㄦ暟鎹�
cuttingReceiveService.removeById(id);
+ cuttingReceiveDetailService.removeById(id);
+
+ // 鑾峰彇搴撳瓨ID鍒楄〃
+ List<String> inventoryIds = detailList.stream()
+ .map(CuttingReceiveDetail::getInventoryId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ // 灏嗙浉鍏冲垁鍏峰簱瀛樼姸鎬佹敼鍥炰箣鍓嶇殑鐘舵��
+ if (!inventoryIds.isEmpty()) {
+ cuttingInventoryService.restoreStatus(inventoryIds);
+ }
+
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -153,6 +171,7 @@
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
this.cuttingReceiveService.removeByIds(Arrays.asList(ids.split(",")));
+ //FIXME: 鎵归噺鍒犻櫎鏃讹紝搴撳瓨鐘舵�佹湭鎭㈠銆備篃闇�瑕佹壒閲忔仮澶嶅簱瀛樼姸鎬併��
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
@@ -214,5 +233,8 @@
return cuttingReceiveService.submit(orderId);
}
- //TODO: @GetMapping("/handleBack")
+ @GetMapping("/handleBack")
+ public Result<?> handleBack(@RequestParam("orderId") String orderId) {
+ return cuttingReceiveService.handleBack(orderId);
+ }
}
--
Gitblit v1.9.3