From 27917a4854f8dcb788d8f35c31d18ae641ebb6f1 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Tue, 25 Mar 2025 14:53:03 +0800
Subject: [PATCH] =?UTF-8?q?bug1221=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/plate/PlateGoodDO.java     |  2 +-
 .../manage/parts/PartsServiceImpl.java        | 24 ++++++++++++++++++-
 .../manage/plate/PlateManageServiceImpl.java  | 19 +++++++++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java
index 33aa7078f..6ed5911f0 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java
@@ -63,7 +63,7 @@ public class PlateGoodDO extends BaseDO {
     /**
      * 价格
      */
-//    private Double price;
+    private Double price;
     /**
      * 品牌
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/parts/PartsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/parts/PartsServiceImpl.java
index 8db7eb37d..ee16e3403 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/parts/PartsServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/parts/PartsServiceImpl.java
@@ -123,7 +123,29 @@ public class PartsServiceImpl implements PartsService {
         }
         // 更新
         updateReqVO.setOrganId(organId).setIsComposite(updateReqVO.getIsComposite() != null && updateReqVO.getIsComposite());
-        PartsDO updateObj = BeanUtils.toBean(updateReqVO, PartsDO.class);
+        PartsDO updateObj = PartsDO.builder()
+                .id(updateReqVO.getId())
+                .organId(organId)
+                .goodsId(updateReqVO.getGoodsId())
+                .name(updateReqVO.getName())
+                .color(getEmpty(updateReqVO.getColor()))
+                .material(getEmpty(updateReqVO.getMaterial()))
+                .category(updateReqVO.getCategory())
+                .type(getEmpty(updateReqVO.getType()))
+                .model(getEmpty(updateReqVO.getModel()))
+                .price(getZeroDouble(updateReqVO.getPrice()))
+                .width(getZeroDouble(updateReqVO.getWidth()))
+                .length(getZeroDouble(updateReqVO.getLength()))
+                .thickness(getZeroDouble(updateReqVO.getThickness()))
+                .spec(getEmpty(updateReqVO.getSpec()))
+                .brand(getEmpty(updateReqVO.getBrand()))
+                .factory(getEmpty(updateReqVO.getFactory()))
+                .unit(getEmpty(updateReqVO.getUnit()))
+                .isComposite(updateReqVO.getIsComposite() != null && updateReqVO.getIsComposite())
+                .subparts(getEmpty(updateReqVO.getSubparts()))
+                .remark(getEmpty(updateReqVO.getRemark()))
+                .build();
+
         partsMapper.updateById(updateObj);
     }
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
index d28bdf42b..893b6b491 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
@@ -99,12 +99,27 @@ public class PlateManageServiceImpl implements PlateManageService {
         if (updateReqVO.getId() == null) {
             throw exception(ErrorCodeConstants.PLATE_NOT_EXISTS);
         }
-        validatePlateExists(Long.valueOf(updateReqVO.getId()), organId);
-        PlateGoodDO updateObj = BeanUtils.toBean(updateReqVO, PlateGoodDO.class);
+        validatePlateExists(updateReqVO.getId(), organId);
+
         // 校验板材goods_id是否相同
         if (plateGoodMapper.isByGoodIDAndId(updateReqVO.getGoodsId(), organId, Long.valueOf(updateReqVO.getId()))) {
             throw exception(PLATE_GOODS_ID_NOT_SAME);
         }
+        PlateGoodDO updateObj = PlateGoodDO.builder()
+                .id(updateReqVO.getId())
+                .goodsId(updateReqVO.getGoodsId())
+                .goodsName(updateReqVO.getGoodsName())
+                .material(updateReqVO.getMaterial())
+                .color(updateReqVO.getColor())
+                .texture(ObjectUtil.isNull(updateReqVO.getTexture()) ? false : updateReqVO.getTexture())
+                .width(getZeroDouble(updateReqVO.getWidth()))
+                .height(getZeroDouble(updateReqVO.getHeight()))
+                .thickness(getZeroDouble(updateReqVO.getThickness()))
+                .price(getZeroDouble(updateReqVO.getPrice()))
+                .brand(getEmpty(updateReqVO.getBrand()))
+                .spec(getEmpty(updateReqVO.getSpec()))
+                .remark(getEmpty(updateReqVO.getRemark()))
+                .build();
         plateGoodMapper.updateById(updateObj);
     }