From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表

---
 src/main/java/com/ruoyi/basic/controller/ProductController.java |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 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..a6d2857 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));
     }
 
     /**
@@ -125,11 +121,27 @@
     }
 
     /**
+     * 鏍规嵁鏉＄爜绮剧‘鏌ヨ浜у搧瑙勬牸锛堥噰璐�/閿�鍞�/搴撳瓨鎵爜閫夊晢鍝侊級
+     */
+    @Operation(summary = "鏍规嵁鏉＄爜鏌ヨ浜у搧瑙勬牸")
+    @GetMapping("/model/byBarcode")
+    public AjaxResult selectByBarcode(@RequestParam String barcode) {
+        if (barcode == null || barcode.trim().isEmpty()) {
+            return AjaxResult.error("璇蜂紶鍏ユ潯鐮�");
+        }
+        ProductModel productModel = productModelService.selectByBarcode(barcode);
+        if (productModel == null) {
+            return AjaxResult.error("鏉＄爜 " + barcode + " 鏈尮閰嶅埌浜у搧瑙勬牸");
+        }
+        return AjaxResult.success(productModel);
+    }
+
+    /**
      * 瀵煎叆浜у搧
      */
     @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