From a7929942577c5aad78af76dbeeb825b18e62163c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 10:25:44 +0800
Subject: [PATCH] fix(production): 修正生产产品主服务中的工时设置逻辑
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 5109662..1c5224b 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -15,7 +15,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import io.swagger.v3.oas.annotations.Operation;
@@ -55,9 +55,8 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProduct")
- public R<?> addOrEditProduct(@RequestBody ProductDto productDto) {
- productService.addOrEditProduct(productDto);
- return R.ok();
+ public AjaxResult addOrEditProduct(@RequestBody ProductDto productDto) {
+ return toAjax(productService.addOrEditProduct(productDto));
}
/**
@@ -65,9 +64,8 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProductModel")
- public R<?> addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
- productModelService.addOrEditProductModel(productModelDto);
- return R.ok();
+ public AjaxResult addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
+ return toAjax(productModelService.addOrEditProductModel(productModelDto));
}
/**
@@ -75,19 +73,18 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public R<?> remove(@RequestBody Long[] ids) {
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return R.fail("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return AjaxResult.error("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- productService.delProductByIds(ids);
- return R.ok();
+ return toAjax(productService.delProductByIds(ids));
}
/**
@@ -95,19 +92,18 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.DELETE)
@DeleteMapping("/delProductModel")
- public R<?> delProductModel(@RequestBody Long[] ids) {
+ public AjaxResult delProductModel(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧瑙勬牸鍨嬪彿
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductModelId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return R.fail("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return AjaxResult.error("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- productModelService.delProductModel(ids);
- return R.ok();
+ return toAjax(productModelService.delProductModel(ids));
}
/**
@@ -129,7 +125,7 @@
*/
@PostMapping("/import")
@Log(title = "瀵煎叆浜у搧", businessType = BusinessType.IMPORT)
- public R<?> importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
+ public AjaxResult importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
return productModelService.importProductModel(file, productId);
}
--
Gitblit v1.9.3