From 5ff08114f2f23a20e5aa912d37e9306a7f40d820 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 13 Nov 2023 17:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E-parentCode?=
 =?UTF-8?q?=E5=AD=98=E6=94=BE=E4=B8=8A=E7=BA=A7id=EF=BC=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9C=AA=E5=AE=8C=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/EquPlanServiceImpl.java  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index 94bdcfe9..815c8ce8 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -413,14 +413,10 @@ public class EquPlanServiceImpl implements IEquPlanService {
         // 处理计划1-n设备信息
         List<EquPlanEqu> equipmentItemList = equPlan.getEquipmentItem();
 
-        // 计划-设备流水号
-        int equipmentCodeTemp = 0;
-
         for (EquPlanEqu equipment : equipmentItemList) {
             equipment.setId(IdUtils.fastSimpleUUID());
             equipment.setPlanCode(equPlan.getPlanCode());
-            equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp));
-            equipment.setParentCode(equPlan.getPlanCode());
+            equipment.setParentCode(equPlan.getPlanId());
             equipment.setFactoryCode(factory);
             equipment.setCreateBy(SecurityContextHolder.getUserName());
             equipment.setCreateTime(DateUtils.getNowDate());
@@ -430,16 +426,13 @@ public class EquPlanServiceImpl implements IEquPlanService {
             // 处理检查项信息
             List<EquPlanDetail> detailList = equipment.getEquPlanDetailList();
             if (detailList != null) {
-                // 计划检查项流水号
-                int itemCodeTemp = 0;
 
                 for (EquPlanDetail item : detailList) {
 
                     if (item != null) {
                         item.setId(IdUtils.fastSimpleUUID());
                         item.setPlanCode(equPlan.getPlanCode());
-                        item.setCode("C" + equipment.getCode() + String.format("%02d", ++itemCodeTemp));
-                        item.setParentCode(equipment.getCode());
+                        item.setParentCode(equipment.getId());
                         item.setCreateBy(SecurityContextHolder.getUserName());
                         item.setCreateTime(DateUtils.getNowDate());
                         item.setUpdateBy(SecurityContextHolder.getUserName());
@@ -458,7 +451,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
                                 checkInsert = true;
 
                                 standard.setId(IdUtils.fastSimpleUUID());
-                                standard.setParentCode(item.getCode());
+                                standard.setParentCode(item.getId());
                                 standard.setPlanCode(equPlan.getPlanCode());
                                 standard.setCreateBy(SecurityContextHolder.getUserName());
                                 standard.setCreateTime(DateUtils.getNowDate());