From b46393eb6df477a5185e7c2a32c4b55f2bba327f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 13 三月 2025 09:58:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index b10f0a1..3e4adc4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8082
+  port: 10012
 
 spring:
   profiles:
@@ -19,17 +19,15 @@
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 mes:
   sequence:
-    order: false
-  minCount: 20
-  carWidth: 5000   #澶ц溅瀹藉害
-  slotWidth: 5000   #澶ц溅瀹藉害
-  inCarMaxSize: 2    #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
-  outCarMaxSize: 3     #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
-  glassGap: 350  #鐜荤拑闂磋窛
+    order: true
+  minCount: 30
+  carWidth: 6200   #澶ц溅瀹藉害
+  slotWidth: 6200   #澶ц溅瀹藉害
+  inCarMaxSize: 5    #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+  outCarMaxSize: 6     #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+  glassGap: 250  #鐜荤拑闂磋窛
   xMaxSize: 2800
-  scan:
-    ip: 192.168.30.199
-    port: 5000
-kangaroohy:
-  milo:
-    enabled: false
\ No newline at end of file
+  slotMaxHeight: 2500
+  slotMaxthickness: 12
+  temperingOutTargetPosition: 930
+  artificialOutTargetPosition: 931
\ No newline at end of file

--
Gitblit v1.8.0