xj添加pda两个新页面

xiaojiao

2025-12-26 4279cb4384f7f960d87af8b8ad9db73c2dececa3

 项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs

@@ -45,12 +45,12 @@
                Dt_TaskWCSinfo wcsInfo = null;
                if (!string.IsNullOrEmpty(rfidResult) && !"0".Equals(rfidResult))
                    wcsInfo = taskWCSinfoRepository.FindFirst(r => r.wcstask_barcode == rfidResult && (r.wcstask_state == TaskState.TaskState_HoisterExecuting.ToString() 
                    || r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString()));
                    || r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString() || r.wcstask_state == TaskState.TaskState_Empty_Out_RGV_Finished.ToString()));
                //wcsInfo = taskWCSinfoRepository.FindFirst(r => r.wcstask_barcode == rfidResult && r.wcstask_state == TaskState.TaskState_Assigned.ToString());
                else
                {
                    wcsInfo = taskWCSinfoRepository.Find(r => r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString()
                              && OutboundStationLayerNo.Contains(r.wcstask_startPoint)).OrderBy(r => r.wcstask_createTime).FirstOrDefault();
                    wcsInfo = taskWCSinfoRepository.Find(r => (r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString() || r.wcstask_state == TaskState.TaskState_Empty_Out_RGV_Finished.ToString()
                    || r.wcstask_state == TaskState.TaskState_HoisterExecuting.ToString()) && OutboundStationLayerNo.Contains(r.wcstask_startPoint)).OrderBy(r => r.wcstask_createTime).FirstOrDefault();
                }
                if (null == wcsInfo)
                    return false;
@@ -89,6 +89,10 @@
                    if(taskplc_Result== wcsInfo.wcstask_barcode)
                    {
                        string state = TaskState.TaskState_Box_Out_Line_Executing.ToString();
                        if (wcsInfo.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString())
                        {
                            state = TaskState.TaskState_Empty_Out_Line_Executing.ToString();
                        }
                        if (wcsInfo.wcstask_state == state)
                            return true;
                        wcsInfo.wcstask_state = state;
@@ -101,6 +105,12 @@
                        if (wcsInfoPLC != null)
                        {
                            string state = TaskState.TaskState_Box_Out_Line_Executing.ToString();
                            if (wcsInfoPLC.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString())
                            {
                                state = TaskState.TaskState_Empty_Out_Line_Executing.ToString();
                            }

                            
                            if (wcsInfoPLC.wcstask_state == state)
                                return true;
                            wcsInfoPLC.wcstask_state = state;