From 3860427fdbed34022ae8df034c3d94cd13c03293 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 24 十月 2025 16:39:09 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs | 217 +++++++++++++++++++++++++++--------------------------
1 files changed, 111 insertions(+), 106 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
index 68a40ac..a18478e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
@@ -12,6 +12,7 @@
using WIDESEA_Core.Helper;
using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
+using static WIDESEA_DTO.SquareCabin.AlarmDto;
using static WIDESEA_DTO.SquareCabin.TowcsDto;
namespace WIDESEA_WMsInfoServices
@@ -22,122 +23,126 @@
{
}
-
- //public WebResponseContent getDeviceStatus(string? deviceCode)
- //{
- // try
- // {
- // var url = "http://172.16.1.2:9357/cube/taskInfo/getDeviceStatus";
- // // 璋冪敤WCS鎺ュ彛鑾峰彇璁惧鐘舵��
- // var result = HttpHelper.Get(url + (string.IsNullOrEmpty(deviceCode) ? "" : $"?deviceCode={deviceCode}"));
- // var response = JsonConvert.DeserializeObject<TowcsResponse<DeviceStatusData>>(result);
+ /// <summary>
+ /// 鏌ョ湅绔嬪簱灏忚溅鎶ヨ淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent getDeviceStatus()
+ {
+ try
+ {
+ var url = "http://172.16.1.2:9357/cube/taskInfo/getDeviceStatus";
- // // 妫�鏌ユ帴鍙ｅ搷搴旀槸鍚︽垚鍔�
- // if (response == null || response.code != "0")
- // {
- // return new WebResponseContent { Status = false, Message = $"WCS鎺ュ彛璋冪敤澶辫触: {response?.msg}" };
- // }
+ // 璋冪敤WCS鎺ュ彛鑾峰彇璁惧鐘舵��
+ var result = HttpHelper.Get(url);
+ var response = JsonConvert.DeserializeObject<AGVResponse<DeviceStatusData>>(result);
- // var syncTime = DateTime.Now;
- // var saveCount = 0;
+ // 妫�鏌ユ帴鍙ｅ搷搴旀槸鍚︽垚鍔�
+ if (response == null || response.code != "0")
+ {
+ return new WebResponseContent { Status = false, Message = $"WCS鎺ュ彛璋冪敤澶辫触: {response?.msg}" };
+ }
- // // 澶勭悊鏈哄櫒浜鸿澶囨暟鎹�
- // if (response.data?.robot != null && response.data.robot.Any())
- // {
- // foreach (var robot in response.data.robot)
- // {
- // // 鏍规嵁璁惧缂栫爜鏌ヨ鏄惁瀛樺湪璁板綍
- // var existingRecord = BaseDal.QueryData(x => x.RobotCode == robot.robotCode).FirstOrDefault();
+ var syncTime = DateTime.Now;
+ var saveCount = 0;
- // if (existingRecord == null)
- // {
- // // 鍒涘缓鏂拌褰�
- // var newRecord = new Dt_EquipmentAlarmInfor
- // {
- // RobotName = robot.robotName,
- // RobotCode = robot.robotCode,
- // Status = robot.status,
- // SyncTime = syncTime,
- // CreateDate = syncTime,
- // Creater = "System"
- // };
- // BaseDal.AddData(newRecord);
- // }
- // else
- // {
- // // 鏇存柊鐜版湁璁板綍
- // existingRecord.RobotName = robot.robotName;
- // existingRecord.Status = robot.status;
- // existingRecord.SyncTime = syncTime;
- // existingRecord.ModifyDate = syncTime;
- // existingRecord.Modifier = "System";
- // BaseDal.UpdateData(existingRecord);
- // }
- // saveCount++;
- // }
- // }
+ // 澶勭悊鏈哄櫒浜鸿澶囨暟鎹�
+ if (response.data?.robot != null && response.data.robot.Any())
+ {
+ foreach (var robot in response.data.robot)
+ {
+ // 鏍规嵁璁惧缂栫爜鏌ヨ鏄惁瀛樺湪璁板綍
+ var existingRecord = BaseDal.QueryData(x => x.RobotCode == robot.robotCode).FirstOrDefault();
- // // 澶勭悊鍒嗘嫞鍙拌澶囨暟鎹�
- // if (response.data?.sorters != null && response.data.sorters.Any())
- // {
- // foreach (var sorter in response.data.sorters)
- // {
- // // 鏍规嵁璁惧缂栫爜鏌ヨ鏄惁瀛樺湪璁板綍
- // var existingRecord = BaseDal.QueryData(x => x.RobotCode == sorter.sorterCode).FirstOrDefault();
+ if (existingRecord == null)
+ {
+ // 鍒涘缓鏂拌褰�
+ var newRecord = new Dt_EquipmentAlarmInfor
+ {
+ RobotName = robot.robotName,
+ RobotCode = robot.robotCode,
+ Status = robot.status,
+ SyncTime = syncTime,
+ CreateDate = syncTime,
+ Creater = "System"
+ };
+ BaseDal.AddData(newRecord);
+ }
+ else
+ {
+ // 鏇存柊鐜版湁璁板綍
+ existingRecord.RobotName = robot.robotName;
+ existingRecord.Status = robot.status;
+ existingRecord.SyncTime = syncTime;
+ existingRecord.ModifyDate = syncTime;
+ existingRecord.Modifier = "System";
+ BaseDal.UpdateData(existingRecord);
+ }
+ saveCount++;
+ }
+ }
- // if (existingRecord == null)
- // {
- // // 鍒涘缓鏂拌褰�
- // var newRecord = new Dt_EquipmentAlarmInfor
- // {
- // RobotName = sorter.sorterName,
- // RobotCode = sorter.sorterCode,
- // Status = sorter.status,
- // SyncTime = syncTime,
- // CreateDate = syncTime,
- // Creater = "System"
- // };
- // BaseDal.AddData(newRecord);
- // }
- // else
- // {
- // // 鏇存柊鐜版湁璁板綍
- // existingRecord.RobotName = sorter.sorterName;
- // existingRecord.Status = sorter.status;
- // existingRecord.SyncTime = syncTime;
- // existingRecord.ModifyDate = syncTime;
- // existingRecord.Modifier = "System";
- // BaseDal.UpdateData(existingRecord);
- // }
- // saveCount++;
- // }
- // }
+ // 澶勭悊鍒嗘嫞鍙拌澶囨暟鎹�
+ if (response.data?.sorters != null && response.data.sorters.Any())
+ {
+ foreach (var sorter in response.data.sorters)
+ {
+ // 鏍规嵁璁惧缂栫爜鏌ヨ鏄惁瀛樺湪璁板綍
+ var existingRecord = BaseDal.QueryData(x => x.RobotCode == sorter.sorterCode).FirstOrDefault();
- // //// 杩斿洖鐘舵�佺粺璁′俊鎭�
- // //var stateStats = response.data?.stateStatistics;
- // //var statsInfo = stateStats != null ?
- // // $"鍙敤:{stateStats.enable}, 鍏呯數:{stateStats.charging}, 涓嶅彲鐢�:{stateStats.disabled}, 閿欒:{stateStats.error}, 绂诲簱:{stateStats.down}, 鍗犵敤:{stateStats.occupied}"
- // // : "鏃犵粺璁′俊鎭�";
+ if (existingRecord == null)
+ {
+ // 鍒涘缓鏂拌褰�
+ var newRecord = new Dt_EquipmentAlarmInfor
+ {
+ RobotName = sorter.sorterName,
+ RobotCode = sorter.sorterCode,
+ Status = sorter.status,
+ SyncTime = syncTime,
+ CreateDate = syncTime,
+ Creater = "System"
+ };
+ BaseDal.AddData(newRecord);
+ }
+ else
+ {
+ // 鏇存柊鐜版湁璁板綍
+ existingRecord.RobotName = sorter.sorterName;
+ existingRecord.Status = sorter.status;
+ existingRecord.SyncTime = syncTime;
+ existingRecord.ModifyDate = syncTime;
+ existingRecord.Modifier = "System";
+ BaseDal.UpdateData(existingRecord);
+ }
+ saveCount++;
+ }
+ }
- // return new WebResponseContent
- // {
- // Status = true,
- // Message = $"鍚屾鎴愬姛锛屽叡澶勭悊 {saveCount} 鏉¤澶囪褰曘�傜姸鎬佺粺璁�: {statsInfo}"
- // };
- // }
- // catch (Exception ex)
- // {
- // // 璁板綍璇︾粏閿欒鏃ュ織
- // Console.WriteLine($"鑾峰彇璁惧鐘舵�佸紓甯�: {ex.Message}, StackTrace: {ex.StackTrace}");
+ //// 杩斿洖鐘舵�佺粺璁′俊鎭�
+ //var stateStats = response.data?.stateStatistics;
+ //var statsInfo = stateStats != null ?
+ // $"鍙敤:{stateStats.enable}, 鍏呯數:{stateStats.charging}, 涓嶅彲鐢�:{stateStats.disabled}, 閿欒:{stateStats.error}, 绂诲簱:{stateStats.down}, 鍗犵敤:{stateStats.occupied}"
+ // : "鏃犵粺璁′俊鎭�";
- // return new WebResponseContent
- // {
- // Status = false,
- // Message = $"鑾峰彇璁惧鐘舵�佸け璐�: {ex.Message}"
- // };
- // }
- //}
+ return new WebResponseContent
+ {
+ Status = true,
+ Message = $"鍚屾鎴愬姛锛屽叡澶勭悊 {saveCount} 鏉¤澶囪褰曘��"
+ };
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍璇︾粏閿欒鏃ュ織
+ Console.WriteLine($"鑾峰彇璁惧鐘舵�佸紓甯�: {ex.Message}, StackTrace: {ex.StackTrace}");
+
+ return new WebResponseContent
+ {
+ Status = false,
+ Message = $"鑾峰彇璁惧鐘舵�佸け璐�: {ex.Message}"
+ };
+ }
+ }
}
}
--
Gitblit v1.9.3