入库验证失败时需要送到NG

source/AssemblyLineClient/FrmLineStore.cs

@@ -457,12 +457,16 @@ namespace OnlineStore.AssemblyLine
                     Process[] processes = Process.GetProcesses();
                     long totalMemery = 0;
                     StringBuilder sbResult = new StringBuilder();
+                    var prevCpuTime = TimeSpan.Zero;
+                    int interval = 1000;
                     foreach (Process process in processes)
                     {
                         if (process.ProcessName.EndsWith("AssemblyLine"))
                         {
                             sbResult.AppendFormat(DateTime.Now.ToLongTimeString() + ", 名称：{0} 内存大小：{1}M ", process.ProcessName, process.PrivateMemorySize64 / 1024 / 1024F);
                             totalMemery += process.PrivateMemorySize64 / 1024;
+                            double value = (process.TotalProcessorTime - prevCpuTime).TotalMilliseconds / interval / Environment.ProcessorCount;
+                            sbResult.AppendFormat(" CPU : " + Math.Round(value, 2) + "%");
                             //    string result = string.Format("进程总数 {0} 个，共占内存：{1}MB \n", processes.Length, totalMemery / 1024) + sbResult.ToString();
                             LogUtil.info(sbResult.ToString());
                         }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -475,11 +475,8 @@ namespace OnlineStore.DeviceLibrary
             }
 
             bool isfull = TrayManager.TrayIsFull(currTrayNum);
-            //LogInfo("***************入库*****验证入库编号，托盘号【" + currTrayNum + "】,isfull【" + isfull + "】");
-            //FixtureCodeInfo code = GetBox().currInOutFixture;
             if (!isfull)
             {
-                //LogInfo("***************入库*****空盘直接放行");
                 return false;
             }
             InOutParam currCode = null;
@@ -492,11 +489,12 @@ namespace OnlineStore.DeviceLibrary
                     for (int i = 0; i < waitInStoreList.Count; i++)
                     {
                         InOutParam cc = waitInStoreList[i];
-                        if (cc.TrayNumber.Equals(currTrayNum) && (!cc.WareCode.Equals("")) && LineServer.RightInPosId(DeviceID, cc.PosId))
+                        if (cc.TrayNumber.Equals(currTrayNum) && (!cc.WareCode.Equals("")))
+                        //if (cc.TrayNumber.Equals(currTrayNum) && (!cc.WareCode.Equals("")) && LineServer.RightInPosId(DeviceID, cc.PosId))
                         {
                             reIndex = i;
                             currCode = cc;
-                            SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW,cc.InStoreNg);
+                            SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW, cc.InStoreNg);
                             break;
                         }
                     }
@@ -508,7 +506,7 @@ namespace OnlineStore.DeviceLibrary
                             return false;
                         }
                         else
-                        { 
+                        {
                             //判断是否验证成功，如果验证失败，不入库
                             if (LineServer.RightInPosId(DeviceID, currCode.PosId))
                             {
@@ -519,7 +517,7 @@ namespace OnlineStore.DeviceLibrary
                             else
                             {
                                 LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除");
-                                TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败"); 
+                                TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
                                 waitInStoreList.RemoveAt(reIndex);
                                 return false;
                             }