From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 373e0e9..c398be5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.service.StandardMethodListService;
@@ -220,7 +222,7 @@
@ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
@DeleteMapping("/deleteProductSupplierAsk")
public Result deleteProductSupplierAsk(Integer supplierAskId) {
- standardProductListSupplierAskService.removeById(supplierAskId);
+ standardProductListSupplierAskService.deleteProductSupplierAsk(supplierAskId);
return Result.success();
}
@@ -246,6 +248,11 @@
@PostMapping("/updateStandardProductListBatch")
public Result updateStandardProductListBatch(@RequestBody Map<String, Object> param) {
List<StandardProductList> standardProductList = (List<StandardProductList>) param.get("standardProductList");
+ if(CollectionUtils.isEmpty(standardProductList)){
+ for (StandardProductList productList : standardProductList) {
+ productList.setCheckStatus(StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
+ }
+ }
return Result.success(standardProductListService.updateBatchById(standardProductList));
}
@@ -255,16 +262,23 @@
return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」澶勭悊")
- @PostMapping("/productListOperate")
- public Result productListOperate(@RequestBody StandardProductListDto standardProductListDto) {
- standardProductListService.productListOperate(standardProductListDto);
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」鎻愪氦")
+ @PostMapping("/productListSubmit")
+ public Result productListSubmit(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListSubmit(standardProductListUpdateRecord);
return Result.success();
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
- @GetMapping("/standardProductListRecordPage")
- public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
- return Result.success(standardProductListService.standardProductListRecordPage(page,standardProductListUpdateRecord));
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」瀹℃牳")
+ @PostMapping("/productListCheck")
+ public Result productListCheck(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListCheck(standardProductListUpdateRecord);
+ return Result.success();
+ }
+
+ @ApiOperation("鏌ヨ鏍囧噯搴撴槸鍚﹀瓨鍦ㄥ鏍镐腑鐘舵��")
+ @GetMapping("/existCheckingRecord")
+ public Result existCheckingRecord(){
+ return Result.success(standardProductListService.existCheckingRecord());
}
}
--
Gitblit v1.9.3