'手动上传'

Admin

2026-01-21 00e64cba66377cb75c9c947908627fe9f631746e

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs

@@ -145,7 +145,7 @@
                        x.Roadway == task.Roadway &&
                        (x.TaskStatus == SC_IN_EXECUTING ||
                         x.TaskStatus == SC_OUT_EXECUTING ||
                         x.TaskStatus == RELOCATION_EXECUTING || x.TaskStatus == RELOCCATION_NEW));
                         x.TaskStatus == RELOCATION_EXECUTING));

                    if (hasExecutingTask)
                        continue;
@@ -255,12 +255,12 @@
                task.TaskStatus = successStatus;
                if(task.TaskStatus== (int)OutTaskStatusEnum.SC_OutExecuting)
                {
                    string Result = MesOutTaskStatusEnum.出库开始.GetDescription();
                    string Result = MesOutTaskStatusEnum.Start.GetDescription();
                    //调取上游系统反馈开始任务
                    _taskService.OutStoreDocCallback(task.TaskNum,Result, "操作成功");
                }else if(task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
                {
                    string Result = MesInTaskStatusEnum.入库开始.GetDescription();
                    string Result = MesInTaskStatusEnum.Start.GetDescription();
                    //调取上游系统反馈开始任务
                    _taskService.InStoreDocCallback(task.TaskNum, Result, "操作成功",task.PalletCode,"");
                }
@@ -294,6 +294,9 @@
        /// <returns></returns>
        public WebResponseContent JudgmentIsRelocations(Dt_Task dt_Task)
        {
            const int PLC_IN_FINISH = (int)InTaskStatusEnum.PLC_InFinish;
            const int SC_IN_EXECUTING = (int)InTaskStatusEnum.SC_IntExecuting;
            const int SC_OUT_EXECUTING = (int)OutTaskStatusEnum.SC_OutExecuting;
            WebResponseContent content = new WebResponseContent();
            try
            {
@@ -304,7 +307,7 @@
                int locrow = judgmentRow(dt_Location.RoadwayNo, dt_Location.Row);
                Dt_LocationInfo shallowLocation = _locationInfoService.Repository.QueryData(x => x.RoadwayNo == dt_Location.RoadwayNo && x.Row == locrow && x.Layer == dt_Location.Layer && x.Column == dt_Location.Column).FirstOrDefault();
                if (shallowLocation.LocationStatus == (int)LocationStatusEnum.Free) return content.OK();
                if (shallowLocation.LocationStatus != (int)(int)LocationStatusEnum.InStock) return content.Error();
                

                //判断是否有移库任务
                var TransferTask = _taskService.Repository.QueryData(x=>x.TaskStatus== (int)RelocationTaskStatusEnum.RelocationNew && x.CurrentAddress== shallowLocation.LocationCode).FirstOrDefault();
@@ -319,17 +322,29 @@
                        int.Parse(TransferTask.PalletType),
                        TransferTask.CurrentAddress,
                        TransferTask.NextAddress,
                        TransferTask.TargetAddress);
                        dt_Task.TargetAddress);
                    if (result.IsSuccess)
                    {
                        TransferTask.TaskStatus = (int)RelocationTaskStatusEnum.RelocationExecuting;
                        _taskService.UpdateData(TransferTask);
                        return content.OK();
                    }
                    else
                    {
                        UpdateTaskStatus(dt_Task, result,
                        successStatus: dt_Task.TaskStatus == PLC_IN_FINISH ? SC_IN_EXECUTING : SC_OUT_EXECUTING, 1);

                        WriteLog.GetLog("判断巷道内移库").Write($"下发堆垛机任务失败，原因：{result.Message}", $"生成移库任务:GenerateTransferTask");
                        return content.Error();
                    }
                }

                var CuttTransferTask = _taskService.Repository.QueryData(x => x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew).FirstOrDefault();
                //判断当前是否有移库任务
                if (CuttTransferTask!=null) return content.Error();


                if (shallowLocation.LocationStatus != (int)LocationStatusEnum.InStock) return content.Error();

                //生成移库任务，进行下发
                return content =GenerateTransferTask(shallowLocation.LocationCode);
@@ -404,8 +419,10 @@
                        _stockInfoService.UpdateData(dt_StockInfo);
                        _unitOfWorkManage.CommitTran();


                        return webResponse.Error("已生成移库任务");
                        //进行下发给堆垛机任务
                        WCSginseng result = _taskService.SC_IssueTasks(
                        /*WCSginseng result = _taskService.SC_IssueTasks(
                            task.TaskId,
                            int.Parse(task.Roadway),
                            task.TaskNum,
@@ -416,13 +433,15 @@
                            task.TargetAddress);
                        if (result.IsSuccess)
                        {
                            task.TaskStatus = (int)RelocationTaskStatusEnum.RelocationExecuting;
                            _taskService.UpdateData(task);
                            return webResponse.OK();
                        }
                        else
                        {
                            WriteLog.GetLog("判断巷道内移库").Write($"下发堆垛机任务失败，原因：{result.Message}", $"生成移库任务:GenerateTransferTask");
                            return webResponse.Error();
                        }
                        }*/
                    }
                    else
                    {