From add77d477ef21d5074afe518f925672a44b7000c Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 2 Aug 2025 17:12:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=96=B0=E7=89=A9=E6=96=99=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/purchasePlan/panels/merger.vue       | 1 +
 .../java/com/klp/controller/WmsRawMaterialController.java | 4 ++--
 .../main/java/com/klp/service/IWmsRawMaterialService.java | 2 +-
 .../com/klp/service/impl/WmsRawMaterialServiceImpl.java   | 4 ++--
 .../service/impl/WmsSalesScriptGeneratorServiceImpl.java  | 8 --------
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
index 9a8ed2d8..f1f0d778 100644
--- a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
+++ b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
@@ -33,6 +33,7 @@
 import { addBomItem } from '@/api/wms/bomItem'
 import { addBom } from '@/api/wms/bom'
 import { updateRawMaterial, addRawMaterial, getRawMaterial } from '@/api/wms/rawMaterial'
+import { updatePurchasePlanDetail } from '@/api/wms/purchasePlanDetail'
 
 export default {
   name: 'Merger',
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java b/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
index 5b99a87b..fb08ab12 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
@@ -72,8 +72,8 @@ public class WmsRawMaterialController extends BaseController {
     @Log(title = "原材料", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsRawMaterialBo bo) {
-        return toAjax(iWmsRawMaterialService.insertByBo(bo));
+    public R<WmsRawMaterialBo> add(@Validated(AddGroup.class) @RequestBody WmsRawMaterialBo bo) {
+        return R.ok(iWmsRawMaterialService.insertByBo(bo));
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsRawMaterialService.java b/klp-wms/src/main/java/com/klp/service/IWmsRawMaterialService.java
index 2e241abd..1e9134dc 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsRawMaterialService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsRawMaterialService.java
@@ -35,7 +35,7 @@ public interface IWmsRawMaterialService {
     /**
      * 新增原材料
      */
-    Boolean insertByBo(WmsRawMaterialBo bo);
+    WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo);
 
     /**
      * 修改原材料
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
index 9082d71e..bd36f753 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
@@ -195,14 +195,14 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
      * 新增原材料
      */
     @Override
-    public Boolean insertByBo(WmsRawMaterialBo bo) {
+    public WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo) {
         WmsRawMaterial add = BeanUtil.toBean(bo, WmsRawMaterial.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setRawMaterialId(add.getRawMaterialId());
         }
-        return flag;
+        return bo;
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsSalesScriptGeneratorServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsSalesScriptGeneratorServiceImpl.java
index 32f6a3b1..6bf76cc3 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsSalesScriptGeneratorServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsSalesScriptGeneratorServiceImpl.java
@@ -1,28 +1,20 @@
 package com.klp.service.impl;
 
 import com.klp.common.config.DeepseekConfig;
-import com.klp.common.core.page.TableDataInfo;
-import com.klp.common.core.domain.PageQuery;
 import com.klp.common.utils.StringUtils;
 import com.klp.domain.bo.WmsSalesScriptGeneratorBo;
 import com.klp.domain.vo.WmsProductSalesScriptVo;
 import com.klp.domain.vo.WmsProductVo;
-import com.klp.domain.vo.WmsProductBomVo;
 import com.klp.domain.WmsProductBom;
 import com.klp.service.IWmsSalesScriptGeneratorService;
 import com.klp.service.IWmsProductService;
 import com.klp.service.IWmsProductBomService;
-import com.klp.service.IWmsProductSalesScriptService;
-import com.klp.common.utils.redis.RedisUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.http.*;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
 
 import javax.annotation.Resource;
 import java.util.*;