出库修改

海波 张

13 小时以前 5321419f5fddb4e877fe90ccd90ebdc1a115af64

 process/DeviceProcess.cs

@@ -173,6 +173,24 @@
                        //1为接驳位交互
                        if (safety.type == 1)
                        {

                            var wcsTask1 = TaskHelper.GetTaskByWorkNo(mst.S_OP_CODE, "wcs");
                            if (wcsTask1 != null)
                            {
                                //立库出库任务完成才能下发
                                if (wcsTask1.S_TYPE.Contains("出库"))
                                {
                                    if (wcsTask1.S_B_STATE != "完成")
                                    {
                                        return;
                                    }
                                }
                            }
                            else {
                                return;
                            }

                           
                            LogHelper.Info($"接驳位安全交互开始 任务号={mst.S_CODE},取货库区接驳位交互" , "安全交互");

                            //先给立库发送卸货通知
@@ -231,6 +249,12 @@

                }else
                 {
                    if (safety.type == 1)
                    {
                        LogHelper.Info($"接驳位安全交互开始 任务号={mst.S_CODE},交互类型为1，取货完成", "安全交互");
                        //取货完成通知立库
                        WcsTask.WcsCallback(mst, state, fkNo);
                    }
                    //1102取货完成
                    if (safety.type == 2)
                    {
@@ -267,7 +291,7 @@
                        //1为接驳位交互
                        if (safety.type == 1)
                        {
                            LogHelper.Info($"接驳位安全交互开始 任务号={mst.S_CODE},交互类型为1，卸货库区货架交互", "安全交互");
                            LogHelper.Info($"接驳位安全交互开始 任务号={mst.S_CODE},交互类型为1，卸货库区接驳位交互", "安全交互");

                            //先给立库发送卸货通知
                            WcsTask.WcsCallback(mst, state, fkNo);
@@ -317,15 +341,18 @@
                                LogHelper.Info($"胎面安全交互卸货，任务号={mst.S_CODE},没找到终点{mst.S_END_LOC}配置", "胎面交互");
                            }
                        }
                    }


                    
                    }                  
                }
                else
                {
                    //1104卸货完成
                    if (safety.type == 2)
                    if (safety.type == 1)
                    {
                        LogHelper.Info($"接驳位安全交互开始 任务号={mst.S_CODE},交互类型为1，卸货完成", "安全交互");
                        //卸货完成通知立库
                        WcsTask.WcsCallback(mst, state, fkNo);
                    }
                        //1104卸货完成
                        if (safety.type == 2)
                    {
                        var safetyLoc = Settings.TmDeviceInfos.Where(a => a.locCode.Contains(mst.S_END_LOC) && a.deviceType == 2).FirstOrDefault();
                        if (safetyLoc != null)