wangxinhui
5 天以前 5368df4e3ab0f1ca849b550a9fcbd0338e7f859d
优化
已修改5个文件
19 ■■■■ 文件已修改
项目代码/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCSServices/WIDESEAWCS_Tasks/二期线体/ConveyorLineDBName.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCSServices/WIDESEAWCS_Tasks/二期线体/ConveyorLineJob2.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs
@@ -116,8 +116,8 @@
                Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
                {
                    { nameof(Dt_LocationInfo.Row),OrderByType.Asc },
                    { nameof(Dt_LocationInfo.Layer),OrderByType.Asc },
                    { nameof(Dt_LocationInfo.Row),OrderByType.Asc },
                    { nameof(Dt_LocationInfo.Columns),OrderByType.Desc },
                };
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs
@@ -151,8 +151,15 @@
            }
            catch (Exception ex)
            {
                if (ex.Message.Contains("数据写入,地址:【23】,写入的数据:【256】") || ex.Message.Contains("数据写入,地址:【21】,写入的数据:【256】"))
                {
                    content.OK();
                }
                else
                {
                content.Error(ex.Message);
            }
            }
            return content;
        }
    }
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -75,7 +75,7 @@
                if (stationManger.StationDeviceCode== "CL1" || stationManger.StationDeviceCode == "CL2")
                {
                    OtherDevice commonConveyorLine = (OtherDevice)device;
                    byte[] bytesPick = commonConveyorLine.Communicator.Read("12", 5);
                    byte[] bytesPick = commonConveyorLine.Communicator.Read("2", 5);
                    string PickBarCode = Encoding.UTF8.GetString(bytesPick).Replace("\0", "").Replace("\\0", "");
                    if (containerFlowDTO.ContainerCode != PickBarCode) throw new Exception($"传入料箱码{containerFlowDTO.ContainerCode},输送料箱码{PickBarCode}数据错误");
                    if (containerFlowDTO.Direction == "100")
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_Tasks/¶þÆÚÏßÌå/ConveyorLineDBName.cs
@@ -35,6 +35,10 @@
        /// <summary>
        /// æ‹£é€‰å޻向/拣选确认(写)
        /// </summary>
        W_PickToHode
        W_PickToHode,
        /// <summary>
        /// å¿ƒè·³å†™å…¥
        /// </summary>
        WriteHeart
    }
}
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_Tasks/¶þÆÚÏßÌå/ConveyorLineJob2.cs
@@ -113,6 +113,8 @@
                        }
                        
                    }
                    conveyorLine.SetValue(ConveyorLineDBName.WriteHeart, true, conveyorLine.DeviceCode);
                }
            }
            catch (Exception ex)