From 0ccbb7ddb6570904640ce1f907a427d0b539fc07 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 17 Nov 2025 10:47:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=E4=BF=AE=E6=94=B9insertByBo=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=BAWmsMateri?=
 =?UTF-8?q?alCoilVo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsMaterialCoilController.java |  4 ++--
 .../klp/service/IWmsMaterialCoilService.java  |  2 +-
 .../impl/WmsMaterialCoilServiceImpl.java      | 23 ++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
index 2f927da3..3fcfc974 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -72,8 +72,8 @@ public class WmsMaterialCoilController extends BaseController {
     @Log(title = "钢卷物料表", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsMaterialCoilBo bo) {
-        return toAjax(iWmsMaterialCoilService.insertByBo(bo));
+    public R<WmsMaterialCoilVo> add(@Validated(AddGroup.class) @RequestBody WmsMaterialCoilBo bo) {
+        return R.ok(iWmsMaterialCoilService.insertByBo(bo));
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
index ca14ccd5..32f74a19 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
@@ -35,7 +35,7 @@ public interface IWmsMaterialCoilService {
     /**
      * 新增钢卷物料表
      */
-    Boolean insertByBo(WmsMaterialCoilBo bo);
+    WmsMaterialCoilVo insertByBo(WmsMaterialCoilBo bo);
 
     /**
      * 修改钢卷物料表
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 8d6238cf..b070eec6 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -149,12 +149,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
     public TableDataInfo<WmsMaterialCoilVo> queryPageList(WmsMaterialCoilBo bo, PageQuery pageQuery) {
         QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
         Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
-        
+
         // 填充每个记录的产品或原材料对象
         for (WmsMaterialCoilVo vo : result.getRecords()) {
             fillItemObject(vo);
         }
-        
+
         return TableDataInfo.build(result);
     }
 
@@ -210,15 +210,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
     public List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo) {
         QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
         List<WmsMaterialCoilVo> list = baseMapper.selectVoListWithDynamicJoin(lqw);
-        
+
         // 填充每个记录的产品或原材料对象
         for (WmsMaterialCoilVo vo : list) {
             fillItemObject(vo);
         }
-        
+
         return list;
     }
-    
+
     /**
      * 填充物品对象（产品或原材料）
      */
@@ -226,12 +226,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (vo.getItemId() == null || vo.getItemType() == null) {
             return;
         }
-        
+
         // 查询原材料信息
         if ("raw_material".equals(vo.getItemType())) {
             WmsRawMaterialVo rawMaterial = rawMaterialService.queryById(vo.getItemId());
             vo.setRawMaterial(rawMaterial);
-            
+
             // 查询原材料对应的BOM信息
             if (rawMaterial != null && rawMaterial.getBomId() != null) {
                 WmsBomItemBo bomItemBo = new WmsBomItemBo();
@@ -240,12 +240,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 vo.setBomItemList(bomItemList);
             }
         }
-        
+
         // 查询产品信息
         if ("product".equals(vo.getItemType())) {
             WmsProductVo product = productService.queryById(vo.getItemId());
             vo.setProduct(product);
-            
+
             // 查询产品对应的BOM信息
             if (product != null && product.getBomId() != null) {
                 WmsBomItemBo bomItemBo = new WmsBomItemBo();
@@ -261,7 +261,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByBo(WmsMaterialCoilBo bo) {
+    public WmsMaterialCoilVo insertByBo(WmsMaterialCoilBo bo) {
         // 1. 生成二维码
         Long qrcodeRecordId = generateQrcodeForInsert(bo);
         bo.setQrcodeRecordId(qrcodeRecordId);
@@ -280,7 +280,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             // 4. 更新二维码内容中的coilId
             updateQrcodeCoilId(qrcodeRecordId, add.getCoilId());
         }
-        return flag;
+        // 4. 返回完整的 VO（包含关联对象）
+        return queryById(add.getCoilId());
     }
 
     /**