退库修改

海波 张

2025-07-07 00b6105b34870f6f5a33551534d0088f3f741906

 core/Monitor.cs

@@ -157,6 +157,7 @@
                                        TaskHelper.Begin(wmsTask, model.forklift_no);
                                        //胎面交互
                                        TaskHelper.TmSafety(wmsTask);
                                        TaskHelper.opMesTask(wmsTask,1);
                                        break;
                                    case 3:
                                        TaskHelper.UpdateStatus(wmsTask, "开始取货");
@@ -188,20 +189,21 @@
                                        LogHelper.Info($"任务{wmsTask.S_CODE}完成，判断入库优先级", "入库优先级");
                                        TaskProcess.inPri(wmsTask);
                                        TaskHelper.End(wmsTask);
                                        TaskHelper.opMesTask(wmsTask, 2);
                                        break;
                                    case 7:

                                        var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                        if (wcsTask1 != null)
                                        {
                                            //agv执行通知 wcs取消
                                            WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
                                            if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
                                                if (wcsTask1.S_B_STATE != "未执行" && wcsTask1.S_B_STATE != "完成" && wcsTask1.S_B_STATE != "取消")
                                            {
                                                    WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                }
                                                TaskHelper.Fail(wcsTask1);
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
                                        }
                                        

                                        TaskHelper.Fail(wmsTask);
                                        TaskProcess.OperateStatus(wmsTask, 7);
@@ -220,6 +222,7 @@
                                            ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                        }
                                        TaskHelper.opMesTask(wmsTask, 3);
                                        break;

                                }
@@ -354,14 +357,13 @@

                        if (workFlow.SENDWCS == "Y")
                        {

                            //正式代码，调用接口寻找可用接驳位
                            var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);

                            var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
                            foreach (var item in balanceConnectionList)
                            {
                                if (item.loc.N_CURRENT_NUM < 2)
                                if (item.loc.N_CURRENT_NUM < 2 && item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
                                {
                                    connection = item.loc.S_CODE;
                                    connectionArea = item.loc.S_AREA_Name;