1

z8018

2 天以前 6e7f192546903b04d2d37e852dd9b248e938c790

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs

@@ -233,6 +233,13 @@
                            int putPoZ = OPositions.HPositions[putPositions[0]].PositionZ - Convert.ToInt32(putPositions[3]) * 1000;

                            int putPoR = 0;

                            int oriTakePoX = takePoX;
                            int oriTakePoY = takePoY;
                            int oriTakePoZ = takePoZ;
                            int oriPutPoX = putPoX;
                            int oriPutPoY = putPoY;
                            int oriPutPoZ = putPoZ;
                            #endregion

                            #region åæ ‡ä¹˜ä»¥1000处理,2#龙门架取反(乘以-1000)
@@ -299,6 +306,11 @@
                            {
                                putPoX = putPoX - (orderContainer.MaxWidth - container.ContainerWidth) / 2 * temp;
                            }

                            if (putPositions[0] == "C016" && containerItem.ItemWidth > 600)
                            {
                                putPoX = putPoX - (container.ContainerWidth - 600) / 2 * temp;
                            }
                            #endregion

                            #region åæ ‡èŒƒå›´åˆ¤æ–­
@@ -348,17 +360,26 @@

                            if (putPoX < minX || putPoX > maxX)
                            {
                                WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-坐标", $"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}");
                                if (task.ExceptionMessage?.Contains($"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}") ?? true)
                                if (putPoX < minX)
                                {
                                    task.ExceptionMessage = $"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}";
                                    _taskRepository.UpdateData(task);
                                    int tempX = minX - putPoX;
                                    takePoX -= tempX;
                                    putPoX = minX;
                                }
                                if (LightStatusStorage.LightStatusDic.ContainsKey(putPositions[0]))
                                if (takePoX < minX || takePoX > maxX)
                                {
                                    LightStatusStorage.LightStatusDic[putPositions[0]] = LightStatusEnum.LightError;
                                    WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-坐标", $"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}");
                                    if (task.ExceptionMessage?.Contains($"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}") ?? true)
                                    {
                                        task.ExceptionMessage = $"X放货坐标超出范围,取货坐标：{putPoX},最大值：{maxX},最小值：{minX}";
                                        _taskRepository.UpdateData(task);
                                    }
                                    if (LightStatusStorage.LightStatusDic.ContainsKey(putPositions[0]))
                                    {
                                        LightStatusStorage.LightStatusDic[putPositions[0]] = LightStatusEnum.LightError;
                                    }
                                    return Task.CompletedTask;
                                }
                                return Task.CompletedTask;
                            }

                            if (takePoY < minY || takePoY > maxY)