剔除

Zhang-Hong-Lin

2025-05-27 7924008bfdcfc7a73428826fc10ae475b1f71353

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -76,8 +76,8 @@

        //SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, 
            ITaskExecuteDetailService taskExecuteDetailService, 
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService,
            ITaskExecuteDetailService taskExecuteDetailService,
            IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository,
            IRepository<Dt_StockInfo> stockRepository,
            IRepository<Dt_LocationInfo> locationRepository,
@@ -210,7 +210,7 @@
        /// <returns></returns>
        public Dt_Task QueryTaskState()
        {
            return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
            return BaseDal.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InNew);
        }

        /// <summary>
@@ -281,11 +281,11 @@
                    //优先返回执行到一半的任务继续执行
                    return task;
                }
                else 
                else
                {
                    //查询天车移动任务
                    task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
                    if (task!=null)
                    if (task != null)
                    {
                        return task;
                    }
@@ -300,16 +300,16 @@
                //{
                //    if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
                //    {
                       

                //    }
                //}
                if (workTpe.Equals("In"))
                {
                    task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                }
                else if (workTpe.Equals("Out"))
                {
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                }

            }
@@ -321,15 +321,15 @@
            return task;
        }

        public Dt_Task QueryTasking() 
        public Dt_Task QueryTasking()
        {
            Dt_Task task = new Dt_Task();
            task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew 
            && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove 
            task = BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew
            && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
            && v.TaskState != (int)TaskOutStatusEnum.OutNew
            && v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
            && v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
            if (task!=null)
            if (task != null)
            {
                return task;
            }
@@ -375,13 +375,13 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryTakNnmTask(int taskNum)
        {
            return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
            return BaseDal.QueryFirst(v => v.TaskId == taskNum);
        }
        /// <summary>
        /// ä¿®æ”¹å¤©è½¦ä»»åŠ¡çŠ¶æ€ï¼Œå°†å…¥åº“取货执行中修改为入库取货完成
        /// </summary>
        /// <returns></returns>
        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) 
        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -475,23 +475,23 @@
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
                if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                if (status == 2 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
                }
                else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
                else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
                }
                else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                else if (status == 3 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
                }
                else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
                else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
                }
                else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
                else if (status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
                {
                    task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
                }
@@ -629,18 +629,18 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight)
        public WebResponseContent StackCraneTaskCompleted(int taskNum, float weight)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
                var nawtask = BaseDal.QueryFirst(v => v.TaskId == taskNum);
                if (nawtask == null)
                {
                    throw new Exception(string.Format("天车放货完成任务未查询到任务号{0}", taskNum));
                }

                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                    string sourceAddress = station.Row + "-" + station.Column + "-1";
@@ -746,7 +746,7 @@
                        _unitOfWorkManage.CommitTran();
                    }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                    string targetAddress = station.Row + "-" + station.Column + "-1";
@@ -776,8 +776,24 @@
                        taskhty.PalletCode = nawtask.PalletCode;
                        taskhty.NextAddress = nawtask.NextAddress;
                        taskhty.CurrentAddress = nawtask.CurrentAddress;
                        //开始数据库事务

                        //如果放货位置行是40，则立马生成一条移动任务
                        //开始创建任务
                        Dt_Task Movstask = new Dt_Task();
                        Movstask.Roadway = "TC01";
                        Movstask.TaskType = (int)TaskMoveEnum.Mowe;
                        Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
                        Movstask.SourceAddress = "0";
                        Movstask.TargetAddress = "8-5-1";
                        Movstask.NextAddress = "text";
                        Movstask.Grade = 1;
                        Movstask.WMSId = 3;
                        Movstask.Remark = 0;
                        Movstask.PalletCode = "text";
                        Movstask.CurrentAddress = "text";

                        //开始数据库事务
                        BaseDal.AddData(Movstask);
                        _unitOfWorkManage.BeginTran();
                        _stockRepository.DeleteData(stock);
                        _locationRepository.UpdateData(location);
@@ -844,7 +860,7 @@
                        _unitOfWorkManage.CommitTran();
                    }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                {
                    //处理任务信息
                    Dt_Task_hty taskhty = new Dt_Task_hty();
@@ -861,7 +877,7 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                    if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                    {
                        //开始创建任务
                        Dt_Task Movstask = new Dt_Task();
@@ -901,7 +917,7 @@
                //回滚事务
                _unitOfWorkManage.RollbackTran();
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
                UpdateTaskExceptionMessage(taskNum,ex.Message);
                UpdateTaskExceptionMessage(taskNum, ex.Message);
            }
            return content;
        }
@@ -1002,7 +1018,7 @@
            WebResponseContent content = new WebResponseContent();
            Dt_Task nawtask = BaseDal.QueryFirst(v => v.TaskId == taskid);
            //入库
            if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
            if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
            {
                //剔除入库
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
@@ -1108,7 +1124,7 @@
                }
            }
            //出库
            else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
            {
                //剔除出库
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
@@ -1164,7 +1180,10 @@
                    location.LocationStatus = (int)LocationStatusEnum.Free;
                    //修改货位状态
                    var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
                    locationTow.LocationStatus = (int)LocationStatusEnum.Free;
                    if (locationTow!=null)
                    {
                        locationTow.LocationStatus = (int)LocationStatusEnum.Free;
                    }
                    //准备历史任务数据
                    Dt_Task_hty taskhty = new Dt_Task_hty();
                    taskhty.TaskNum = nawtask.TaskNum;
@@ -1184,9 +1203,12 @@

                    _unitOfWorkManage.BeginTran();
                    _stockRepository.DeleteData(stock);
                    _stockRepository.DeleteData(Towstock);
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationTow);
                    if (locationTow != null)
                    {
                        _locationRepository.UpdateData(locationTow);
                        _stockRepository.DeleteData(Towstock);
                    }
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务
@@ -1260,17 +1282,24 @@
                    location.LocationStatus = (int)LocationStatusEnum.InStock;
                    //修改货位信息
                    var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                    locationtow.LocationStatus = (int)LocationStatusEnum.InStock;

                    Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                   
                    if (locationtow != null)
                    {
                        locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
                        stockInfos.StockStatus = (int)stockEnum.Free;
                    }
                    Dt_StockInfo stockInfo = _stockRepository.QueryFirst(v => v.LocationCode == task.SourceAddress);
                    stockInfo.StockStatus = (int)stockEnum.Free;
                    Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                    stockInfos.StockStatus = (int)stockEnum.Free;
                    
                    _unitOfWorkManage.BeginTran();
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationtow);
                    if (locationtow != null)
                    {
                        _locationRepository.UpdateData(locationtow);
                        _stockRepository.UpdateData(stockInfos);
                    }
                    _stockRepository.UpdateData(stockInfo);
                    _stockRepository.UpdateData(stockInfos);
                    BaseDal.DeleteData(task);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("5");
@@ -1309,7 +1338,7 @@
            return content.OK("1");
        }

        public WebResponseContent banzidong(string wei,string weis)
        public WebResponseContent banzidong(string wei, string weis)
        {
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
@@ -1376,5 +1405,148 @@
            }
            return content.OK("1");
        }

        public WebResponseContent zhijiechuku()
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                if (oldtask != null)
                {
                    throw new Exception($"当前任务池中已存在一条出库任务");
                }
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                task.TargetAddress = station.Row + "-" + station.Column + "-1";
                var stations = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                task.SourceAddress = stations.Row + "-" + stations.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu;
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _dt_taskRepositiry.AddData(task);
                    return content.OK("2");
                }
            }
            else
            {
                return content.OK("1");
            }
            return content.OK("3");
        }

        public WebResponseContent tichuchuku(string wei)
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_TCMode && !OHTJob.oHTReadData.R_TC_isready)
            //{
            //    throw new Exception($"规整机剔除架子可放板或剔除上料模式信号为false");
            //}
            //查询当前任务池中是否存在出库任务，出库任务只能存在一条
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                if (oldtask != null)
                {
                    throw new Exception($"当前任务池中已存在一条出库任务");
                }
                //查询库存
                Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (huo.LocationStatus == 0)
                {
                    return content.OK("4");
                }
                huo.LocationStatus = 1;
                Dt_StockInfo stockinfo = _StockInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (stockinfo==null)
                {
                    return content.OK("4");
                }
                stockinfo.StockStatus = 1;
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                task.TargetAddress = station.Row + "-" + station.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.SourceAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuChuKu;
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _unitOfWorkManage.BeginTran();
                    _dt_taskRepositiry.AddData(task);
                    _LocationInfoRepository.UpdateData(huo);
                    _StockInfoRepository.UpdateData(stockinfo);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("2");
                }
            }   
            return content.OK("3");
        }

        public WebResponseContent tichuruku(string wei)
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
            //{
            //    throw new Exception($"整形机投入使用信号为false");
            //}
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                //判断库存是否有货
                //查询货位
                Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (huo.LocationStatus!=0)
                {
                    return content.OK("4");
                }
                huo.LocationStatus = 1;
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                task.SourceAddress = station.Row + "-" + station.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.TargetAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskInboundTypeEnum.TiChuRuKu;
                    task.TaskState = (int)TaskInStatusEnum.InNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _unitOfWorkManage.BeginTran();
                    _dt_taskRepositiry.AddData(task);
                    _LocationInfoRepository.UpdateData(huo);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("2");
                }
            }
            else
            {
                return content.OK("1");
            }
            return content.OK("3");
        }
    }
}