From 66522363f350a79c0d82731efef0c8c04574fd1c Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sat, 3 May 2025 22:41:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E9=80=80=E7=81=AB?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=202.=20=E8=AF=95=E9=AA=8C?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/controller/ExperimentController.java    | 12 +++---------
 .../impl/ExperimentAnnealProcessServiceImpl.java     |  8 +++-----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 0048697..872451c 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -183,23 +183,17 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         if (!StringUtils.startsWith(experimentNo, "KC")) {
             return Result.error("实验编号格式不正确！");
         }
-        if (StringUtils.isNotBlank(experiment.getId())) {
+        //0503: 暂存 去掉状态的判断
+        /*if (StringUtils.isNotBlank(experiment.getId())) {
             Experiment dbExp = experimentService.getById(experiment.getId());
             if (!(StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING) || StringUtils.equals(dbExp.getStatus(),
                     ExperimentStatus.PRE_TEST))) {
                 return Result.error("实验状态不正确！");
             }
-        }
+        }*/
         experiment.setStatus(ExperimentStatus.STAGING);
         experimentService.saveWithDetail(experiment);
 
-        ExperimentLog experimentLog = new ExperimentLog();
-        experimentLog.setExperimentId(experiment.getId());
-        experimentLog.setLogContent("暂存实验");
-        String username = JwtUtil.getUserNameByToken(request);
-        SysUser userByName = userService.getUserByName(username);
-        experimentLog.setCreateBy(userByName.getRealname());
-        experimentLogService.save(experimentLog);
         return Result.OK("暂存成功！");
     }
 
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
index 784fa08..779f41e 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
@@ -82,19 +82,17 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
     @Override
     public void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess, String type) {
         // 保存样品信息
-        // 20250502 - 邓春: 不修改前端 传过来的样品信息列表
-/*
         List<ExperimentSampleInfo> sampleInfoList = experimentAnnealProcess.getSampleInfoList();
         List<String> sampleInfoIds = new ArrayList<>();
         if (CollUtil.isNotEmpty(sampleInfoList)) {
             for (ExperimentSampleInfo sampleInfo : sampleInfoList) {
-                sampleInfo.setExperimentId(experimentAnnealProcess.getExperimentId());
-                experimentSampleInfoService.saveOrUpdate(sampleInfo);
+                // 20250502 - 邓春: 不修改前端 传过来的样品信息列表
+                //sampleInfo.setExperimentId(experimentAnnealProcess.getExperimentId());
+                // experimentSampleInfoService.saveOrUpdate(sampleInfo);
                 sampleInfoIds.add(sampleInfo.getId());
             }
         }
         experimentAnnealProcess.setSampleInfo(StringUtils.join(sampleInfoIds, ","));
-*/
 
         // 保存偏置条件信息
         // 20250502 - 邓春: 不修改前端 传过来的退火设备大字段