From 01670063aed6f8dc39447e6ea0cd57f3b4872832 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Wed, 29 May 2024 16:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=95=E5=85=A5=EF=BC=8C=20=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E5=87=BA=E5=BA=93=E5=88=86=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sizeData/FactoryDataSizeDetailRespVO.java |  3 +++
 .../FactoryDataSizeServiceImpl.java           | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeDetailRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeDetailRespVO.java
index f516736a..05cadb5f 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeDetailRespVO.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeDetailRespVO.java
@@ -35,6 +35,9 @@ public class FactoryDataSizeDetailRespVO {
         @Schema(description = "打包线数据id")
         private Long id;
 
+        @Schema(description = "打包线名称")
+        private String packageName;
+
         @Schema(description = "规格id")
         private Long sizeId;
 
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java
index 7d64e71b..0303dad7 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java
@@ -120,13 +120,23 @@ public class FactoryDataSizeServiceImpl implements FactoryDataSizeService{
         // 判断打包线数据不为空时， 同步插入打包线数据
         if (!createReqVO.getPackageData().isEmpty()) {
 
-            PackageDataCreateReqVO packCreateReqVO = new PackageDataCreateReqVO();
-            packCreateReqVO.setFactoryId(createReqVO.getPackageData().get(0).getFactoryId());
-            packCreateReqVO.setPackageData(createReqVO.getPackageData());
-            packCreateReqVO.setPackageDate(createReqVO.getDate());
+            if (createReqVO.getPackageData().get(0).getId() != null) {
 
-            //插入打包线数据
-            packageDataService.createPackageData(packCreateReqVO);
+                PackageDataCreateReqVO updateVO = new PackageDataCreateReqVO();
+                updateVO.setPackageData(createReqVO.getPackageData());
+
+                //更新 打包线数据
+                packageDataService.updatePackageData(updateVO);
+            }else {
+
+                PackageDataCreateReqVO packCreateReqVO = new PackageDataCreateReqVO();
+                packCreateReqVO.setFactoryId(createReqVO.getPackageData().get(0).getFactoryId());
+                packCreateReqVO.setPackageData(createReqVO.getPackageData());
+                packCreateReqVO.setPackageDate(createReqVO.getDate());
+
+                //插入打包线数据
+                packageDataService.createPackageData(packCreateReqVO);
+            }
         }
 
         return (long) factoryDataSizeDOs.size();