MeiRuiAn/HuaiAn.git

wangxinhui

2025-06-11 62dcd2cfc37d520d2f051fbe0629ae75c09cd50c

提交代码

已删除1个文件

已修改3个文件

已添加1个文件

已重命名1个文件

	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/437eaad1-d4b0-4025-a3d0-f20e51f16d43.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4b93f505-b509-4621-b97f-51e95ab6ac4d.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/ZH_AGVController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/阻焊仓/AGV_ZHExtend.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/阻焊仓/GroundStationJob_ZH.cs	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a781aea4-6c55-46f2-8bc0-4e65a884c665.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/437eaad1-d4b0-4025-a3d0-f20e51f16d43.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4b93f505-b509-4621-b97f-51e95ab6ac4d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/ZH_AGVController.cs

@@ -141,7 +141,7 @@
                            task.CurrentAddress = dt_Station.StationCode;
                            task.NextAddress = "";
                            task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
                            task.DeviceCode = "SC01_CSJ";
                            task.DeviceCode = "SC01_ZH";
                            var up = _taskRepository.UpdateData(task);
                            agvResponseContent.Code = up ? "0" : "1";
                            agvResponseContent.Message = up ? "æå" : "å¤±è´¥";

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/×èº¸²Ö/AGV_ZHExtend.cs

@@ -100,6 +100,7 @@
                        {
                            continue;
                        }
                        otherDevice.SetValue(GroundStationDBName.W_PutPalletType, WaitToTask.PalletType, stationManger.StationCode);
                    }
                    else
                    {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/×èº¸²Ö/GroundStationJob_ZH.cs

@@ -79,26 +79,17 @@
                        if (item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt())
                        {
                            
                             Dt_Task task = _taskRepository.QueryFirst(x =>x.DeviceCode== device.DeviceCode && x.TargetAddress==item.StationCode && x.NextAddress==item.StationCode && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt() &&  x.CurrentAddress == item.Remark);
                             Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress==item.StationCode && string.IsNullOrEmpty(x.TargetAddress) && string.IsNullOrEmpty(x.NextAddress) && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt());
                            if (task != null)
                            {
                                if (isCanPut)
                                {
                                    device.SetValue(GroundStationDBName.W_PutRequest, true, item.StationCode);
                                    device.SetValue(GroundStationDBName.W_PutPalletType, task.PalletType, item.StationCode);//task.PalletType
                                }
                                //å¤æAGVä»»å¡å®æï¼ååç»å°é¢ç«æ¾è´§å®æ
                                device.SetValue(GroundStationDBName.W_PutFinish, true, item.StationCode);

                                string oldAddress = task.NextAddress;
                                int oldStatus = task.TaskState;
                                Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);
                                if (stationManger == null)
                                {
                                    WriteError(item.StationName, $"æªæ¾å°å¯¹åºç«å°ä¿¡æ¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
                                    continue;
                                }
                                string? locationCode = "SC01_ZH-001-027-001-02";// _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
                                //string? locationCode = "SC01_ZH-001-027-001-02";//
                                string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
                                if (string.IsNullOrEmpty(locationCode))
                                {
                                    WriteError(item.StationName, $"è¯·æ±åéè´§ä½è¿åä¿¡æ¯éè¯¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
@@ -111,34 +102,6 @@
                    catch (Exception ex)
                    {
                        WriteError(device.DeviceCode, $"{item}äº¤äºéè¯¯", ex);
                    }
                }

                foreach (var item in stationMangers.Where(x => !deviceStations.Contains(x.StationCode)))
                {
                    try
                    {
                        Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && x.SourceAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType));
                        if (task != null)
                        {
                            Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);
                            if (stationManger == null)
                            {
                                WriteError(item.StationName, $"æªæ¾å°å¯¹åºç«å°ä¿¡æ¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
                                continue;
                            }
                            string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
                            if (string.IsNullOrEmpty(locationCode))
                            {
                                WriteError(item.StationName, $"è¯·æ±åéè´§ä½è¿åä¿¡æ¯éè¯¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
                                continue;
                            }
                            _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, currentAddress: stationManger.StackerCraneStationCode, targetAddress: locationCode, nextAddress: locationCode, deviceCode: stationManger.StackerCraneCode);
                        }
                    }
                    catch (Exception ex)
                    {

                    }
                }
            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a781aea4-6c55-46f2-8bc0-4e65a884c665.vsidx

Binary files differ

			@@ -141,7 +141,7 @@
			task.CurrentAddress = dt_Station.StationCode;
			task.NextAddress = "";
			task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			task.DeviceCode = "SC01_CSJ";
			task.DeviceCode = "SC01_ZH";
			var up = _taskRepository.UpdateData(task);
			agvResponseContent.Code = up ? "0" : "1";
			agvResponseContent.Message = up ? "æå" : "å¤±è´¥";

			@@ -100,6 +100,7 @@
			{
			continue;
			}
			otherDevice.SetValue(GroundStationDBName.W_PutPalletType, WaitToTask.PalletType, stationManger.StationCode);
			}
			else
			{

			@@ -79,26 +79,17 @@
			if (item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt())
			{

			Dt_Task task = _taskRepository.QueryFirst(x =>x.DeviceCode== device.DeviceCode && x.TargetAddress==item.StationCode && x.NextAddress==item.StationCode && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt() && x.CurrentAddress == item.Remark);
			Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress==item.StationCode && string.IsNullOrEmpty(x.TargetAddress) && string.IsNullOrEmpty(x.NextAddress) && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt());
			if (task != null)
			{
			if (isCanPut)
			{
			device.SetValue(GroundStationDBName.W_PutRequest, true, item.StationCode);
			device.SetValue(GroundStationDBName.W_PutPalletType, task.PalletType, item.StationCode);//task.PalletType
			}
			//å¤æAGVä»»å¡å®æï¼ååç»å°é¢ç«æ¾è´§å®æ
			device.SetValue(GroundStationDBName.W_PutFinish, true, item.StationCode);

			string oldAddress = task.NextAddress;
			int oldStatus = task.TaskState;
			Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);
			if (stationManger == null)
			{
			WriteError(item.StationName, $"æªæ¾å°å¯¹åºç«å°ä¿¡æ¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
			continue;
			}
			string? locationCode = "SC01_ZH-001-027-001-02";// _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
			//string? locationCode = "SC01_ZH-001-027-001-02";//
			string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
			if (string.IsNullOrEmpty(locationCode))
			{
			WriteError(item.StationName, $"è¯·æ±åéè´§ä½è¿åä¿¡æ¯éè¯¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
			@@ -111,34 +102,6 @@
			catch (Exception ex)
			{
			WriteError(device.DeviceCode, $"{item}äº¤äºéè¯¯", ex);
			}
			}

			foreach (var item in stationMangers.Where(x => !deviceStations.Contains(x.StationCode)))
			{
			try
			{
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && x.SourceAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType));
			if (task != null)
			{
			Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);
			if (stationManger == null)
			{
			WriteError(item.StationName, $"æªæ¾å°å¯¹åºç«å°ä¿¡æ¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
			continue;
			}
			string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
			if (string.IsNullOrEmpty(locationCode))
			{
			WriteError(item.StationName, $"è¯·æ±åéè´§ä½è¿åä¿¡æ¯éè¯¯,è®¾å¤ç¼å·:{item.StationCode},ä»»å¡å·:{task.TaskNum}");
			continue;
			}
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, currentAddress: stationManger.StackerCraneStationCode, targetAddress: locationCode, nextAddress: locationCode, deviceCode: stationManger.StackerCraneCode);
			}
			}
			catch (Exception ex)
			{

			}
			}
			}