11,13,15，最低=12mm

source/AssemblyLineClient/FrmLineStore.cs

@@ -451,7 +451,7 @@ namespace OnlineStore.AssemblyLine
             try
             try
             {
             {
                 TimeSpan sp = DateTime.Now - lastLogTime;
                 TimeSpan sp = DateTime.Now - lastLogTime;
-                if (sp.TotalMinutes > 3)
+                if (sp.TotalMinutes > 10)
                 {
                 {
                     lastLogTime = DateTime.Now;
                     lastLogTime = DateTime.Now;
                     Process[] processes = Process.GetProcesses();
                     Process[] processes = Process.GetProcesses();
@@ -463,7 +463,7 @@ namespace OnlineStore.AssemblyLine
                     {
                     {
                         if (process.ProcessName.EndsWith("AssemblyLine"))
                         if (process.ProcessName.EndsWith("AssemblyLine"))
                         {
                         {
-                            sbResult.AppendFormat(DateTime.Now.ToLongTimeString() + ", 名称：{0} 内存大小：{1}M ", process.ProcessName, process.PrivateMemorySize64 / 1024 / 1024F);
+                            sbResult.AppendFormat(DateTime.Now.ToLongTimeString() + ", 名称：{0} 内存：{1}M ", process.ProcessName, process.PrivateMemorySize64 / 1024 / 1024F);
                             totalMemery += process.PrivateMemorySize64 / 1024;
                             totalMemery += process.PrivateMemorySize64 / 1024;
                             double value = (process.TotalProcessorTime - prevCpuTime).TotalMilliseconds / interval / Environment.ProcessorCount;
                             double value = (process.TotalProcessorTime - prevCpuTime).TotalMilliseconds / interval / Environment.ProcessorCount;
                             sbResult.AppendFormat(" CPU : " + Math.Round(value, 2) + "%");
                             sbResult.AppendFormat(" CPU : " + Math.Round(value, 2) + "%");

source/AssemblyLineClient/记录.txt

@@ -3,6 +3,9 @@
 上料模块，RFID读取改为扫描模式，如果没有读到料架号，直接送出料架。
 上料模块，RFID读取改为扫描模式，如果没有读到料架号，直接送出料架。
 大盘>30mm的料入库时，托盘先不顶升，等待横移机构到达托盘上方后，升降下降，顶升上升。
 大盘>30mm的料入库时，托盘先不顶升，等待横移机构到达托盘上方后，升降下降，顶升上升。
 
 
+七寸盘最高=16mm.
+11,13,15，最低=12mm
+
 20200409
 20200409
 紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号
 紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号
 
 

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -779,10 +779,21 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 LastHeight = GetHeight();
                 LastHeight = GetHeight();
-                if (LastWidth.Equals(7) && LastHeight > 16)
+                if (LastWidth.Equals(7))
                 {
                 {
-                    LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，七寸盘默认最高盘高=16，修改高度为16");
-                    LastHeight = 16;
+                    if (LastHeight > 16)
+                    {
+                        LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，七寸盘默认盘高最高=16，修改高度为16");
+                        LastHeight = 16;
+                    }
+                }
+                else
+                {
+                    if (LastHeight <12)
+                    {
+                        LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，非七寸盘默认盘高最低=12，修改高度为12");
+                        LastHeight = 12;
+                    }
                 }
                 }
                 //判断是否还有料盘
                 //判断是否还有料盘
                 if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW))