出库修改

海波 张

2025-06-03 baf741a2c65777b70d96b6c5d60204170dd92626

 process/TaskProcess.cs

@@ -441,6 +441,23 @@

                LogHelper.Info($"推送任务{mst.S_CODE}", "NDC");


                if (mst.S_TYPE.Contains("出库"))
                {
                    var wcsTask = TaskHelper.GetTaskByWork("wcs", mst.S_OP_CODE);
                    if (wcsTask == null) {
                        LogHelper.Info($"推送任务{mst.S_CODE}，没找到作业:{mst.S_OP_CODE}对应的出库任务", "NDC");
                        return false;
                    }

                    if (wcsTask.S_B_STATE=="未执行")
                    {
                        LogHelper.Info($"推送任务{mst.S_CODE}，对应的Wcs出库任务未执行，暂不推送", "NDC");
                        return false;
                    }
                }


                start = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
                end = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);

@@ -456,6 +473,7 @@
                if (work==null)
                {
                    LogHelper.Info($"推送任务{mst.S_CODE}，没找到作业:{mst.S_OP_CODE}", "NDC");
                    return false;
                }

                if (string.IsNullOrEmpty(work.CONNECTION))
@@ -1346,23 +1364,6 @@
                    //如果需要下发wcs立库，则需要寻找可用接驳位
                    if (workFlow.SENDWCS == "Y") {

                        //测试默认取一个接驳位
                        //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
                        //foreach (var item in connectionList)
                        //{
                        //    if (item.S_LOCK_STATE == "无" && item.N_CURRENT_NUM < 2)
                        //    {
                        //        connection = item.S_CODE;
                        //        LogHelper.Info($"ZCSendTask入库任务下发寻找到可用接驳位{connection}", "Mes任务下发");
                        //    }
                        //}

                        //if (connection=="")
                        //{
                        //    LogHelper.Info($"ZCSendTask任务下发寻找接驳位失败", "Mes任务下发");
                        //    throw new Exception($"ZCSendTask任务下发寻找接驳位失败");
                        //}

                        //正式代码，调用接口寻找可用接驳位
                        var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
                        var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
@@ -1671,6 +1672,10 @@
                                    result.errMsg = "满托出库作业有库存但设备报警";
                                    result.errCode = 2001;
                                    result.success = true;
                                    mesRes.errCode = result.errCode;
                                    mesRes.errMsg = result.errMsg;
                                    //保存mes记录
                                    CreatMesRes(mesRes);
                                    return result;
                                }
                            }
@@ -1759,23 +1764,6 @@

                    if (workFlow.SENDWCS == "Y")
                    {
                        //测试默认取一个接驳位
                        //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
                        //foreach (var item in connectionList)
                        //{
                        //    if (item.S_LOCK_STATE == "无" && item.N_CURRENT_NUM < 2)
                        //    {
                        //        connection = item.S_CODE;
                        //        LogHelper.Info($"ZCSendTask入库任务下发寻找到可用接驳位{connection}", "Mes任务下发");
                        //    }
                        //}

                        //if (connection == "")
                        //{
                        //    LogHelper.Info($"ZCSendTask任务下发寻找接驳位失败", "Mes任务下发");
                        //    throw new Exception($"ZCSendTask任务下发寻找接驳位失败");
                        //}


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