From 5d756f53f07880dc8b7ba0bc9f060b9e94d4b25e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 05 十一月 2025 18:08:34 +0800
Subject: [PATCH] 修改人工入库完成和wcs小车问题
---
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs | 178 +++++++++++++++++++++++++----------------------------------
1 files changed, 75 insertions(+), 103 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 ca1d6f7..3e2c26c 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"
@@ -7,6 +7,7 @@
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -20,131 +21,102 @@
{
public class EquipmentAlarmInforService : ServiceBase<Dt_EquipmentAlarmInfor, IRepository<Dt_EquipmentAlarmInfor>>, IEquipmentAlarmInforService
{
- public EquipmentAlarmInforService(IRepository<Dt_EquipmentAlarmInfor> BaseDal) : base(BaseDal)
+ private readonly IMessageInfoService _messageInfoService;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+
+ public EquipmentAlarmInforService(IRepository<Dt_EquipmentAlarmInfor> BaseDal, IMessageInfoService messageInfoService, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
+ _messageInfoService = messageInfoService;
+ _unitOfWorkManage = unitOfWorkManage;
}
-
-
- /// <summary>
- /// 鏌ョ湅绔嬪簱灏忚溅鎶ヨ淇℃伅
- /// </summary>
- /// <returns></returns>
public WebResponseContent getDeviceStatus()
{
+ WebResponseContent content = new WebResponseContent();
try
{
var url = "http://172.16.1.2:8080/cube/taskInfo/getDeviceStatus?token=wH5zdAUCv2BEHJIinmowyki8cdc5ge8fAwFDcYZs0bVldNgmORt0O0l4GJTDv1dglRdMxb9xDK5Qb3NJAqL1Li2GkfdVa3KnIkfrQZtsP7UXhMmUz6xEuztG6d5svAJO9HENLb8JWVqCfpO2EWV6ebo/g5tJ9x7kbwwAxvCBrWdiEJv09FvaRQ== ";
var result = HttpHelper.Get(url);
-
var response = JsonConvert.DeserializeObject<AGVResponse<DeviceStatusData>>(result);
-
-
-
- // 妫�鏌ユ帴鍙ｅ搷搴旀槸鍚︽垚鍔�
- if (response == null || response.code != "0")
- {
- return new WebResponseContent { Status = false, Message = $"WCS鎺ュ彛璋冪敤澶辫触: {response?.msg}" };
- }
-
- var syncTime = DateTime.Now;
- var saveCount = 0;
+ if (response == null || response.code != "0" || response.data == null) return content.Error($"鑾峰彇璁惧淇℃伅澶辫触: {response?.msg}");
+ List<string> codes = new List<string>();
+ if (response.data.robot.Count < 1 || response.data.sorters.Count < 0) return content.Error($"鑾峰彇璁惧淇℃伅涓虹┖: {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();
-
- 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++;
- }
- }
+ codes.AddRange(response.data.robot.Select(x => x.robotCode).ToList());
// 澶勭悊鍒嗘嫞鍙拌澶囨暟鎹�
- 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();
+ codes.AddRange(response.data.sorters.Select(x => x.sorterCode).ToList());
- if (existingRecord == null)
+ if (codes.Count < 1) return content;
+ List<Dt_EquipmentAlarmInfor> equipmentAlarmInfors = BaseDal.QueryData(x => codes.Contains(x.RobotCode));
+ if (equipmentAlarmInfors.Count < 1) return content;
+ List<Dt_EquipmentAlarmInfor> equipmentAlarmInforsAdd = new List<Dt_EquipmentAlarmInfor>();
+ List<Dt_EquipmentAlarmInfor> equipmentAlarmInforsUp = new List<Dt_EquipmentAlarmInfor>();
+ foreach (var item in response.data.robot)
+ {
+ Dt_EquipmentAlarmInfor? equipmentAlarmInfor = equipmentAlarmInfors.Where(x => x.RobotCode == item.robotCode).FirstOrDefault();
+ if (equipmentAlarmInfor == null)
+ {
+ equipmentAlarmInfor = new Dt_EquipmentAlarmInfor()
{
- // 鍒涘缓鏂拌褰�
- 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++;
+ RobotCode = item.robotCode,
+ RobotName = item.robotName,
+ Status = item.status,
+ SyncTime = DateTime.Now,
+ CreateDate = DateTime.Now,
+ };
+ equipmentAlarmInforsAdd.Add(equipmentAlarmInfor);
+ }
+ else
+ {
+ equipmentAlarmInfor.RobotName = item.robotName;
+ equipmentAlarmInfor.Status = item.status;
+ equipmentAlarmInfor.SyncTime = DateTime.Now;
+ equipmentAlarmInforsUp.Add(equipmentAlarmInfor);
+ }
+ if (string.Equals(item.status, nameof(DeviceStatus.Error), StringComparison.OrdinalIgnoreCase))
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "灏忚溅缂栧彿" + item.robotCode, item.status);
}
}
-
- //// 杩斿洖鐘舵�佺粺璁′俊鎭�
- //var stateStats = response.data?.stateStatistics;
- //var statsInfo = stateStats != null ?
- // $"鍙敤:{stateStats.enable}, 鍏呯數:{stateStats.charging}, 涓嶅彲鐢�:{stateStats.disabled}, 閿欒:{stateStats.error}, 绂诲簱:{stateStats.down}, 鍗犵敤:{stateStats.occupied}"
- // : "鏃犵粺璁′俊鎭�";
-
- return new WebResponseContent
+ foreach (var item in response.data.sorters)
{
- Status = true,
- Message = $"鍚屾鎴愬姛锛屽叡澶勭悊 {saveCount} 鏉¤澶囪褰曘��"
- };
+ Dt_EquipmentAlarmInfor? equipmentAlarmInfor = equipmentAlarmInfors.Where(x => x.RobotCode == item.sorterCode).FirstOrDefault();
+ if (equipmentAlarmInfor == null)
+ {
+ equipmentAlarmInfor = new Dt_EquipmentAlarmInfor()
+ {
+ RobotCode = item.sorterCode,
+ RobotName = item.sorterName,
+ Status = item.status,
+ SyncTime = DateTime.Now,
+ CreateDate = DateTime.Now,
+ };
+ equipmentAlarmInforsAdd.Add(equipmentAlarmInfor);
+ }
+ else
+ {
+ equipmentAlarmInfor.RobotName = item.sorterName;
+ equipmentAlarmInfor.Status = item.status;
+ equipmentAlarmInfor.SyncTime = DateTime.Now;
+ equipmentAlarmInforsUp.Add(equipmentAlarmInfor);
+ }
+ if (string.Equals(item.status, nameof(DeviceStatus.Error), StringComparison.OrdinalIgnoreCase))
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "鍒嗘嫞鍙癰缂栫爜" + item.sorterCode, item.status);
+ }
+ }
+ if (equipmentAlarmInforsAdd.Count > 0) BaseDal.AddData(equipmentAlarmInforsAdd);
+ if (equipmentAlarmInforsUp.Count > 0) BaseDal.UpdateData(equipmentAlarmInforsUp);
}
catch (Exception ex)
{
- // 璁板綍璇︾粏閿欒鏃ュ織
- Console.WriteLine($"鑾峰彇璁惧鐘舵�佸紓甯�: {ex.Message}, StackTrace: {ex.StackTrace}");
-
- return new WebResponseContent
- {
- Status = false,
- Message = $"鑾峰彇璁惧鐘舵�佸け璐�: {ex.Message}"
- };
+ content.Error(ex.Message);
}
+ return content;
}
+
+
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3