From 55fb3f5a3d6efc4e5c91c5438c137aeabb1d2c37 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 19 一月 2026 11:57:33 +0800
Subject: [PATCH] feat(production): 新增工艺路线和BOM管理功能

---
 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 077e80a..c498b93 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -19,6 +19,7 @@
 import com.ruoyi.sales.service.ShippingInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -54,15 +55,16 @@
     @ApiOperation("娣诲姞鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult add(@RequestBody ShippingInfo req) {
+        LambdaQueryWrapper<ShippingInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId());
+        wrapper.eq(ShippingInfo::getSalesLedgerProductId, req.getSalesLedgerProductId());
+        List<ShippingInfo> list = shippingInfoService.list(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            return AjaxResult.error("鍙戣揣淇℃伅宸插瓨鍦�");
+        }
         boolean save = shippingInfoService.save(req);
         if(save){
-            LambdaQueryWrapper<ShippingInfo> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId());
-            wrapper.eq(ShippingInfo::getSalesLedgerProductId, req.getSalesLedgerProductId());
             ShippingInfo shippingInfo = shippingInfoService.getOne(wrapper);
-            if(shippingInfo == null){
-                return AjaxResult.error("鍙戣揣淇℃伅涓嶅瓨鍦�");
-            }
             ShipmentApproval shipmentApproval = new ShipmentApproval();
             shipmentApproval.setSalesLedgerId(req.getSalesLedgerId());
             shipmentApproval.setSalesLedgerProductId(req.getSalesLedgerProductId());

--
Gitblit v1.9.3