紧急出料从入料NG口出

source/AssemblyLineClient/记录.txt

-
+20200817
+紧急出料从入料NG口出
+分盘料从入料4出
+
+
+
+
 20200812
 分流bug修改。
 httpPost方法修改。

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -710,7 +710,9 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH))
                 {
-                    LogUtil.info(logN + " ，入口有料架，暂不处理");
+                    LogUtil.info(logN + " ，入口有料架，暂不处理，重置 [" + nodeId + "] 状态为None");
+                    AgvClient.SetToNone(nodeId);
+                    return;
                 }
                 ShelfEnterProcess();
 
@@ -719,7 +721,9 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.LOW))
                 {
-                    LogUtil.info(logN + " ，未检测到出口有料架，暂不处理");
+                    LogUtil.info(logN + " ，未检测到出口有料架，暂不处理，重置 [" + nodeId + "] 状态为None");
+                    AgvClient.SetToNone(nodeId);
+                    return;
                 }
                 ShelfOutProcess();
             }

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1483,7 +1483,8 @@ namespace OnlineStore.DeviceLibrary
                     bool debugNeed = (runStatus >= LineRunStatus.Runing) && info.IsFull && info.InOrOutStore.Equals(2);
                     debugNeed = false;
 
-                    bool isJinji = (param.urgentReel || param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
+                    bool isJinji = (param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
+                    //bool isJinji = (param.urgentReel || param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
 
                     if (debugNeed || isJinji)
                     {

source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs

@@ -380,7 +380,8 @@ namespace OnlineStore.DeviceLibrary
                             return true;
                         }
                     }
-                    else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
+                    else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore)  && inoup.cutReel.Equals(false))
+                    //else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
                     {
                         outMsg = "皮带线出料";
                         return true;

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -70,10 +70,13 @@ namespace OnlineStore.DeviceLibrary
                 }
                 //MoveInfo.MoveParam = moveParam;
                 MoveInfo.NewMove(LineMoveType.OutStore, moveParam);
-                posId = moveParam.PosId + "[" + moveParam.WareCode + "][" + moveParam.rfid + "]";
+                posId = "[" + moveParam.PosId + "][" + moveParam.WareCode + "][" + moveParam.rfid + "]";
                 if (moveParam.InStoreNg)
                 {
                     posId = moveParam.rfid + "NG料" + "[" + moveParam.WareCode + "]";
+                }else if(moveParam.urgentReel)
+                { 
+                    posId = "[" + moveParam.PosId  + "]紧急出料" + "[" + moveParam.WareCode + "]";
                 }
                 MoveInfo.NextMoveStep(LineMoveStep.DLO_01_NGBack);
                 LogUtil.info(Name + "开始送料【" + moveParam.ToStr() + "】：" + MoveInfo.SLog + "NG气缸后退");
@@ -194,7 +197,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (LineTurnIsStop())
                 {
-                    if (MoveInfo.MoveParam.InStoreNg)
+                    if (MoveInfo.MoveParam.InStoreNg || MoveInfo.MoveParam.urgentReel)
                     {
                         MoveInfo.NextMoveStep(LineMoveStep.DLO_08_NGBefore);
                         LogUtil.info(Name + "送料【" + posId + "】：" + MoveInfo.SLog + "NG气缸前进");

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -154,6 +154,11 @@ namespace OnlineStore.DeviceLibrary
                 //入料失败料
                 return inoup;
             }
+            else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.Config.SidesWayNum.Equals(4))
+            {
+                outMsg = "出库紧急料";
+                return inoup;
+            }
             else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
             {
                 List<int> mustLine = new List<int>();
@@ -243,7 +248,7 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     //空闲且皮带线出料已结束 
-                    if (kongxian )
+                    if (kongxian)
                     {
                         //随机分配
                         //Random r = new Random();
@@ -626,6 +631,23 @@ namespace OnlineStore.DeviceLibrary
                         MoveInfo.NextMoveStep(LineMoveStep.PO_08_CylinderRelax);
                         OutLog("出料：" + MoveInfo.SLog + "，夹料气缸放松）");
                         CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
+
+                        if (MoveInfo.MoveParam.urgentReel && this.Config.SidesWayNum.Equals(4))
+                        {
+                            Task.Factory.StartNew(delegate
+                            {
+                                OutLog("出料：" + MoveInfo.SLog + "，紧急料，且SidesWayNum=4，发送 afterPutCut");
+                                TaskData taskData;
+                                string shefId = "BN";
+                                int ShelfLoc = 1;
+                                string msg = SServerManager.afterPutCut(Name, shefId, MoveInfo.MoveParam.WareCode, "", ShelfLoc, out taskData);
+                                if (String.IsNullOrEmpty(msg).Equals(false))
+                                {
+                                    LogUtil.error(Name + "【" + MoveInfo.MoveParam.WareCode + "】【" + shefId + "】【" + ShelfLoc.ToString() + "】afterPutCut 结果：" + msg);
+                                    taskData = null;
+                                }
+                            });
+                        }
                     }
                     else if (MoveInfo.IsTimeOut())
                     {