From 3106b64087cf6199b5a35aafb0eb583676017aa6 Mon Sep 17 00:00:00 2001 From: wanshenmean <cathay_xy@163.com> Date: 星期四, 07 十一月 2024 16:47:44 +0800 Subject: [PATCH] 暂存 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs index 0335a14..99582b3 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs @@ -309,28 +309,30 @@ { if (!commonStackerCrane.StackerOnline) { - BasicDto dto = new BasicDto + RequestEqptRunDto request = new RequestEqptRunDto() { EmployeeNo = "T00001", EquipmentCode = commonStackerCrane.DeviceCode, RequestTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"), SessionId = Guid.NewGuid().ToString(), Software = commonStackerCrane.DeviceName, + Password = "12345", + EquipmentModel = "1" }; - var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", dto.ToJsonString()); + var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", request.ToJsonString()); if (respone != null) { var result = JsonConvert.DeserializeObject<ResponseEqptRunDto>(respone); if (result != null && result.Success) { - var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceName).FirstOrDefault(); + var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceCode).FirstOrDefault(); if (process == null) { ResponeRunDto runDto = JsonConvert.DeserializeObject<ResponeRunDto>(respone); process = new Dt_EquipmentProcess() { EquipmentName = commonStackerCrane.DeviceCode, - EquipmentType = commonStackerCrane.DeviceName.Substring(commonStackerCrane.DeviceCode.IndexOf("鍫嗗灈鏈�")), + EquipmentType = new string(commonStackerCrane.DeviceName.TakeWhile(c => !char.IsDigit(c)).ToArray()), WipOrderNo = runDto.WipOrderNo, ProductDesc = runDto.ProductDesc, ProcessValue = JsonConvert.SerializeObject(result) -- Gitblit v1.9.3