diff --git a/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java b/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java
index 9a6b688..2ce6013 100644
--- a/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java
+++ b/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java
@@ -10,10 +10,12 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.concurrent.TimeUnit;
@@ -29,9 +31,21 @@ import java.util.concurrent.TimeUnit;
 @Aspect
 public class RepeatSubmitAspect {
 
+	@Value("${repeatSubmit.time}")
+	private int repeatSubmitTime;
+
+
+	// 缓存数据存放，后续可调整缓存过期时间
+	private static Cache<String, Object> caches;
+
 	//缓存数据存放 后续要改小时间 目前十秒钟
-	private static final Cache<String, Object> caches = CacheBuilder.newBuilder()
-			.maximumSize(10000).expireAfterWrite(10, TimeUnit.SECONDS).build();
+	@PostConstruct
+	public void init() {
+		caches = CacheBuilder.newBuilder()
+				.maximumSize(10000)
+				.expireAfterWrite(repeatSubmitTime, TimeUnit.SECONDS)
+				.build();
+	}
 	
 	//切点
 	@Pointcut("@annotation(com.gaotao.common.annotation.RepeatSubmit)")
diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index 1cf21c8..a9b9da8 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -1101,12 +1101,13 @@ public class BaseServiceImpl implements BaseService {
             ProductionLineData checkIn = new ProductionLineData();
             checkIn.setProLineNo(inData.getProLineNo());
             checkIn.setSite(inData.getSite());
-            List<ProductionLineData> checkProductionLine = baseMapper.getProLineNoDetail(checkIn);
+            //  2024-12-06王总要求去掉生产线的强制要求
+            /*List<ProductionLineData> checkProductionLine = baseMapper.getProLineNoDetail(checkIn);
             if (checkProductionLine.size() == 0) {
                 responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200049));
                 responseData.setCode("500");
                 return responseData;
-            }
+            }*/
             List<AccessSiteData> list = baseMapper.checkAccessSite(inData.getSite(), inData.getUser());
             if (list.size() == 0) {
                 responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200040));
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index fdd2b1a..2c4392f 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -94,9 +94,14 @@ public class ScheduleServiceImpl implements ScheduleService {
                 String laterShipFlag = mergeStatusCon.substring(0, 1);
                 String earlierItemFlag = mergeStatusCon.substring(2, 3);
                 String finishPreItemFlag = mergeStatusCon.substring(4, 5);
+                String colourFlag = mergeStatusCon.substring(6, 7);
                 schedule.setLaterShipFlag(laterShipFlag);
                 schedule.setEarlierItemFlag(earlierItemFlag);
                 schedule.setFinishPreItemFlag(finishPreItemFlag);
+                //如果颜色字段有强制提示  需要修改颜色
+                if("Y".equalsIgnoreCase(colourFlag)) {
+                    schedule.setColorStyle("fifthColor");
+                }
             }
         }
         return resultList;
diff --git a/src/main/resources/mapper/toolman/ToolDetailMapper.xml b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
index 5463cb8..312ef50 100644
--- a/src/main/resources/mapper/toolman/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
@@ -280,7 +280,7 @@
                 PurchaseDate = #{purchaseDate,jdbcType=TIMESTAMP},
                 PhaseInDate = #{phaseInDate,jdbcType=TIMESTAMP},
                 PhaseOutDate = #{phaseOutDate,jdbcType=TIMESTAMP},
-                 lifespan = #{lifespan}
+                lifespan = #{lifespan}
         </set>
         <where>
             Site=#{site,jdbcType=VARCHAR} AND ToolInstanceID=#{toolInstanceId,jdbcType=VARCHAR}