From bfc11f87e2b64420c9917c0b9881b3e327d6f796 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 22:19:59 +0800
Subject: [PATCH] 优化调拨出入库
---
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs | 207 +++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 114 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..7949385 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"
@@ -4,140 +4,119 @@
using System;
using System.Collections.Generic;
using System.Linq;
+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;
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
{
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;
}
-
+ 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" || 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}");
- //public WebResponseContent getDeviceStatus(string? deviceCode)
- //{
- // try
- // {
- // var url = "http://172.16.1.2:9357/cube/taskInfo/getDeviceStatus";
+ // 澶勭悊鏈哄櫒浜鸿澶囨暟鎹�
+ codes.AddRange(response.data.robot.Select(x => x.robotCode).ToList());
- // // 璋冪敤WCS鎺ュ彛鑾峰彇璁惧鐘舵��
- // var result = HttpHelper.Get(url + (string.IsNullOrEmpty(deviceCode) ? "" : $"?deviceCode={deviceCode}"));
- // var response = JsonConvert.DeserializeObject<TowcsResponse<DeviceStatusData>>(result);
+ // 澶勭悊鍒嗘嫞鍙拌澶囨暟鎹�
+ codes.AddRange(response.data.sorters.Select(x => x.sorterCode).ToList());
- // // 妫�鏌ユ帴鍙ｅ搷搴旀槸鍚︽垚鍔�
- // if (response == null || response.code != "0")
- // {
- // return new WebResponseContent { Status = false, Message = $"WCS鎺ュ彛璋冪敤澶辫触: {response?.msg}" };
- // }
+ 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()
+ {
+ 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);
+ }
+ }
+ foreach (var item in response.data.sorters)
+ {
+ 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.sorterCode;
+ 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)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
- // var syncTime = DateTime.Now;
- // var saveCount = 0;
- // // 澶勭悊鏈哄櫒浜鸿澶囨暟鎹�
- // 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++;
- // }
- // }
-
- // // 澶勭悊鍒嗘嫞鍙拌澶囨暟鎹�
- // 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 = 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++;
- // }
- // }
-
- // //// 杩斿洖鐘舵�佺粺璁′俊鎭�
- // //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 = true,
- // Message = $"鍚屾鎴愬姛锛屽叡澶勭悊 {saveCount} 鏉¤澶囪褰曘�傜姸鎬佺粺璁�: {statsInfo}"
- // };
- // }
- // catch (Exception ex)
- // {
- // // 璁板綍璇︾粏閿欒鏃ュ織
- // Console.WriteLine($"鑾峰彇璁惧鐘舵�佸紓甯�: {ex.Message}, StackTrace: {ex.StackTrace}");
-
- // return new WebResponseContent
- // {
- // Status = false,
- // Message = $"鑾峰彇璁惧鐘舵�佸け璐�: {ex.Message}"
- // };
- // }
- //}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3