北京轴承库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
xiaojiao
13 小时以前 557f02072fa311eefe3123aa44afebac22adc465 
 ÏîÄ¿´úÂë/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundAreaDispathAction.cs


@@ -1,5 +1,6 @@


using HslCommunication;


using Newtonsoft.Json;


using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;


using System;


using System.Collections.Generic;


using System.Linq;


@@ -228,6 +229,9 @@


                    if (flag || !noflag)


                        continue;




                    // å‡ºåº“区的 åŠ ä¸€ä¸ªæ¡ä»¶ï¼Œå½“前层如果任务没有完成，例如60102层任务状态在提升机执行中没有进行到输送线执行中就不能下发这个层的rgv任务






                    //同一层有执行中的任务不添加


                    //Dt_TaskWCSinfo executingTask = taskWCSinfoRepository.FindFirst(r => 


                    //(r.wcstask_startPoint == wcsTask.wcstask_startPoint || r.wcstask_endPoint == wcsTask.wcstask_endPoint)


@@ -324,7 +328,6 @@


                return BarcodeLockDict[barcode].Item1;


            }


        }




        public static void InboundRequestAction(IDt_TaskWCSinfoRepository taskWCSinfoRepository, IDt_TaskRGVinfoRepository taskRGVinfoRepository, PLCClient client)


        {


            try


@@ -395,10 +398,6 @@


                                    WebResponseContent content = WMSApi.PostInboundRequstToWMS(barcode);


                                    if (content.Status)


                                    {


                                        //WmsTaskInfo wmsTask = JsonConvert.DeserializeObject<WmsTaskInfo>(content.Data.ToString());


                                        //wcsInfo = CommonFunction.AddWCSEmptyInboundTask(wmsTask, taskWCSinfoRepository);


                                        //taskWCSinfoRepository.Add(wcsInfo, true);


                                        //client.WriteValue(CLineInfoDBName.W_Line_PLCDispatch.ToString(), ReInboundRequestStationNo, 2);


                                        try


                                        {


                                            WmsTaskInfo wmsTask = JsonConvert.DeserializeObject<WmsTaskInfo>(content.Data.ToString());


@@ -459,7 +458,7 @@


                                            }


                                            else if (content.Message.Contains("暂无货位可分配"))


                                            {




                                                Console.WriteLine("暂无货位可分配");


                                            }


                                            else 


                                            {


@@ -487,6 +486,8 @@


            catch (Exception ex)


            {


                client.WriteValue(CLineInfoDBName.W_Line_PLCDispatch.ToString(), ReInboundRequestStationNo, 3);


                LogRecord.WriteLog(LogEnum.Errer, DateTime.Now.ToString() + ex.Message.ToString());




                Console.Out.WriteLine(DateTime.Now + ex.Message);


            }


        }