bug修改

source/AssemblyLineClient/FrmLineIO.Designer.cs

@@ -431,7 +431,7 @@
             this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.numTrayNum.Location = new System.Drawing.Point(78, 29);
             this.numTrayNum.Maximum = new decimal(new int[] {
-            150,
+            200,
             0,
             0,
             0});

source/AssemblyLineClient/FrmLineIO.cs

@@ -417,11 +417,11 @@ namespace OnlineStore.AssemblyLine
         {
             //int num = cmbTray.SelectedIndex + 101;
             int num = (int)numTrayNum.Value;
-            if (num < 100)
-            {
-                MessageBox.Show("请输入大于100的托盘号","提示", MessageBoxButtons.OK,MessageBoxIcon.Error,MessageBoxDefaultButton.Button1);
-                return;
-            }
+            //if (num < 100)
+            //{
+            //    MessageBox.Show("请输入大于100的托盘号","提示", MessageBoxButtons.OK,MessageBoxIcon.Error,MessageBoxDefaultButton.Button1);
+            //    return;
+            //}
             TrayInfo tray = TrayManager.GetTrayInfo(num);
             
             DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -356,13 +356,23 @@ namespace OnlineStore.DeviceLibrary
             else
             {
                 LogUtil.LOGGER.Info(Name + "  [" + trayCount + "] IP [" + RFIDManager.GetRFIP(DeviceID) + "] 当前托盘 [" + currTrayNum + "] 上个托盘 [" + preTrayNum + "] ");
+
+
                 if (preTrayNum.Equals(currTrayNum) && currTrayNum > 0)
-                {
-                    TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号错乱：当前托盘 [" + currTrayNum + "] 上个托盘[" + preTrayNum + "] ，连续两个托盘号一样";
+                {   //如果是接驳台HY，不需要验证托盘号是否重复
+                    List<int> jHy = new List<int>() { 210, 212, 217 };
+                    if (jHy.Contains(DeviceID))
+                    {
+                        LogUtil.error(Name + "：当前托盘 [" + currTrayNum + "] 上个托盘[" + preTrayNum + "] ，连续两个托盘号一样，当前为出料口横移，不需要处理托盘号重复");
+                    }
+                    else
+                    {
+                        TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号错乱：当前托盘 [" + currTrayNum + "] 上个托盘[" + preTrayNum + "] ，连续两个托盘号一样";
 
-                    LogUtil.error(Name + "托盘号错乱：当前托盘 [" + currTrayNum + "] 上个托盘[" + preTrayNum + "] ，连续两个托盘号一样");
-                    //托盘号一样，返回false
-                    return false;
+                        LogUtil.error(Name + "托盘号错乱：当前托盘 [" + currTrayNum + "] 上个托盘[" + preTrayNum + "] ，连续两个托盘号一样");
+                        //托盘号一样，返回false
+                        return false;
+                    }
                 }
             }
 

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -364,7 +364,7 @@ namespace OnlineStore.DeviceLibrary
             string code = SecondMoveInfo.MoveParam.WareCode;
             bool isNg = false;
             string result = SServerManager.GetTraySize(Name, robotIndex, code, out LastWidth, out isNg);
-            OutLog("接驳台托盘[" + currTrayNum + "] [" + code + "] 获取尺寸【" + LastWidth + "】"+(isNg?"NG":"")+"【" + result + "】");
+            OutLog("接驳台托盘[" + currTrayNum + "] [" + code + "] 获取尺寸【" + LastWidth + "】"+(isNg?"NG":"")+"【" + result + "】",1);
 
             if (LastWidth > 0)
             {