史达克沈阳立库项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
huanghongfeng
22 小时以前 bce2cc310d462ffbe56ee3d9f3d9368abf481aad 
 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs


@@ -2,6 +2,7 @@


using Quartz;


using SqlSugar;


using System.Threading.Tasks;


using WIDESEA_Comm.Http;


using WIDESEAWCS_Common;


using WIDESEAWCS_Common.Helper;


using WIDESEAWCS_Common.TaskEnum;


@@ -83,11 +84,19 @@


                                // å‡ºåº“


                                if (conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && !ACK)//出库


                                {


                                    if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//采购入库


                                    if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))


                                    {




                                        Dt_Task dt_Ta = _taskService.GetOutTaskInfo2(conveyorLineInfoRead.Barcode);


                                        if (dt_Ta != null)


                                    {


                                        device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.EndPos, 2011, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.TaskNo, 1111, item.StationCode);


                                            device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);


                                            device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);




                                            //删除任务


                                            _taskRepository.DeleteData(dt_Ta);


                                        }


                                    }


                                }


                                else if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && ACK)


@@ -153,17 +162,23 @@


                                    if (dt_Ta != null)


                                    {


                                        Dt_Router dt_Router = _routerRepository.QueryFirst(x => x.StartPosi == dt_Ta.TargetAddress);


                                        //堆垛机任务完成下一地址改成输送线下一地址，设备编号改成输送线


                                        _taskService.UpdateTaskStatusToNext(dt_Ta.TaskNum);


                                        


                                        device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.EndPos, dt_Router.NextPosi, item.StationCode);


                                        device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);


                                        //堆垛机任务完成下一地址改成输送线下一地址，设备编号改成输送线


                                        _taskService.UpdateTaskStatusToNext(dt_Ta.TaskNum);




                                        if (dt_Ta.TargetAddress !="2021" && dt_Ta.TargetAddress != "2020")


                                        {


                                        //删除任务


                                        _taskRepository.DeleteData(dt_Ta);


                                    }




                                }




                                }




                                else if (!conveyorLineSignalRead.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && STB && !ACK)


                                {


                                    device.SetValue(W_ConveyorLineDB.STB, false, item.StationCode);