From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index eb57e76..73f92fb 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,33 +1,31 @@
 package com.aps.core.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
-
 import com.aps.common.core.utils.DateUtils;
 import com.aps.common.core.utils.uuid.IdUtils;
 import com.aps.common.security.utils.DictUtils;
+import com.aps.core.domain.ApsPlatePlan;
 import com.aps.core.domain.ApsPlatePlanTemp;
 import com.aps.core.mapper.ApsPartPlanTempMapper;
+import com.aps.core.mapper.ApsPlatePlanMapper;
 import com.aps.core.mapper.ApsPlatePlanTempMapper;
+import com.aps.core.service.IApsPlatePlanService;
 import com.aps.system.api.domain.SysDictData;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsPlatePlanMapper;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.service.IApsPlatePlanService;
+
+import java.util.List;
+import java.util.Optional;
 
 /**
  * 閽i噾璁″垝绠$悊Service涓氬姟灞傚鐞�
- * 
+ *
  * @author ruoyi
  * @date 2025-04-08
  */
 @Service
-public class ApsPlatePlanServiceImpl implements IApsPlatePlanService 
+public class ApsPlatePlanServiceImpl implements IApsPlatePlanService
 {
     @Autowired
     private ApsPlatePlanMapper apsPlatePlanMapper;
@@ -39,7 +37,7 @@
 
     /**
      * 鏌ヨ閽i噾璁″垝绠$悊
-     * 
+     *
      * @param id 閽i噾璁″垝绠$悊涓婚敭
      * @return 閽i噾璁″垝绠$悊
      */
@@ -51,7 +49,7 @@
 
     /**
      * 鏌ヨ閽i噾璁″垝绠$悊鍒楄〃
-     * 
+     *
      * @param apsPlatePlan 閽i噾璁″垝绠$悊
      * @return 閽i噾璁″垝绠$悊
      */
@@ -63,7 +61,7 @@
 
     /**
      * 鏂板閽i噾璁″垝绠$悊
-     * 
+     *
      * @param apsPlatePlan 閽i噾璁″垝绠$悊
      * @return 缁撴灉
      */
@@ -77,7 +75,7 @@
 
     /**
      * 淇敼閽i噾璁″垝绠$悊
-     * 
+     *
      * @param apsPlatePlan 閽i噾璁″垝绠$悊
      * @return 缁撴灉
      */
@@ -89,7 +87,7 @@
 
     /**
      * 鎵归噺鍒犻櫎閽i噾璁″垝绠$悊
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑閽i噾璁″垝绠$悊涓婚敭
      * @return 缁撴灉
      */
@@ -101,7 +99,7 @@
 
     /**
      * 鍒犻櫎閽i噾璁″垝绠$悊淇℃伅
-     * 
+     *
      * @param id 閽i噾璁″垝绠$悊涓婚敭
      * @return 缁撴灉
      */

--
Gitblit v1.9.3