1.前后端增加复位功能
2.tcpclient心跳设置 3.优化后端启动速度 4.增加后端出库日志
This commit is contained in:
hehaibing-1996
@ -38,6 +38,7 @@ namespace WCS.BLL.Config
|
||||
/// </summary>
|
||||
public string? WMSUrl { get; set; }
|
||||
|
||||
public bool IsResetDBOrTable { get; set; }
|
||||
#region 盟讯公司后台配置
|
||||
public bool IsMx { get; set; }
|
||||
/// <summary>
|
||||
|
||||
@ -72,7 +72,7 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
return;
|
||||
}
|
||||
|
||||
public void SetCurrentMode()
|
||||
|
||||
@ -302,6 +302,7 @@ namespace WCS.BLL.HardWare
|
||||
CurrentOutStoreMatSNs.Clear();
|
||||
////添加属于当前货架的物料
|
||||
CurrentOutStoreMatSNs.AddRange(MatDetails.Select(t => t.MatSN).ToList());
|
||||
Logs.Write($"货架【{ShelfCode}】本次发料物料为{string.Join(",", CurrentOutStoreMatSNs)}！", LogsType.Outstore);
|
||||
////记录当前出库的发料单
|
||||
CurrentOutOrder = outOrder;
|
||||
|
||||
@ -365,12 +366,16 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logs.Write($"货架【{ShelfCode}】进入出库模式发生异常！", LogsType.Outstore);
|
||||
GoOutOutstore();
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
public void GoOutOutstore()
|
||||
{
|
||||
try
|
||||
{
|
||||
Logs.Write($"货架【{ShelfCode}】，开始退出出库", LogsType.Outstore);
|
||||
//找到在出库中的模组
|
||||
var outingModules = Modules.Where(t => t.CurrentMode == Mode.出库模式)
|
||||
.ToList();
|
||||
@ -378,8 +383,6 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
module.GoOutOutStoreMode(TcpCleint);
|
||||
}
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
//通信校验
|
||||
var timeOut = 3000;
|
||||
var timeSpan = TimeSpan.FromMilliseconds(0);
|
||||
@ -408,7 +411,7 @@ namespace WCS.BLL.HardWare
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = true,
|
||||
WarningType = WarningTypeEnum.退出入库未响应,
|
||||
WarningType = WarningTypeEnum.退出出库未响应,
|
||||
StoreId = 0,
|
||||
StoreCode = "",
|
||||
ShelfCode = ShelfCode,
|
||||
@ -418,10 +421,16 @@ namespace WCS.BLL.HardWare
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
}
|
||||
//});
|
||||
|
||||
CurrentOutStoreMatSNs.Clear();
|
||||
WarningLight.CloseLight(TcpCleint);
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
Logs.Write($"货架【{ShelfCode}】，结束退出出库", LogsType.Outstore);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logs.Write($"货架【{ShelfCode}】，退出出库时发生异常{ex.Message}", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
|
||||
public void GoInStocktaking(List<StockTakingOrderMatDetail> MatDetails, StockTakingOrder stockTakingOrder)
|
||||
@ -603,9 +612,18 @@ namespace WCS.BLL.HardWare
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
}
|
||||
|
||||
void IShelfBase.Reset()
|
||||
public void Reset()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
var modules = Modules.Where(t => t.IsEnable).ToList();
|
||||
if (modules != null && modules.Count > 0)
|
||||
{
|
||||
modules.ForEach(t =>
|
||||
{
|
||||
t.Reset(TcpCleint);
|
||||
});
|
||||
}
|
||||
WarningLight.CloseLight(TcpCleint);
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
}
|
||||
|
||||
void IShelfBase.SetCurrentMode()
|
||||
@ -630,7 +648,6 @@ namespace WCS.BLL.HardWare
|
||||
#region 协议返回处理
|
||||
public void ProtocolProcess(byte[] data, int boardId, int lightNumber)
|
||||
{
|
||||
Logs.Write("协议处理4");
|
||||
//协议处理 判断功能位
|
||||
switch (data[TcpCleint.PreFixLength + 2])
|
||||
{
|
||||
@ -672,7 +689,6 @@ namespace WCS.BLL.HardWare
|
||||
break;
|
||||
|
||||
}
|
||||
Logs.Write("协议处理5");
|
||||
}
|
||||
/// <summary>
|
||||
/// 进入入库模式返回信号处理
|
||||
@ -1034,19 +1050,16 @@ namespace WCS.BLL.HardWare
|
||||
/// <param name="lightNumber"></param>
|
||||
public void InStoreExceptionReturnProcess(byte[] data, int boardId, int lightNumber)
|
||||
{
|
||||
Logs.Write("协议处理5.1");
|
||||
lightNumber = (int)data[TcpCleint.PreFixLength + 4];
|
||||
var storeInfo = DbHelp.db.Queryable<StoreInfo>()
|
||||
.Where(t => t.ShelfId == ShelfId)
|
||||
.Where(t => t.BoardId == boardId && t.LightNumber == lightNumber)
|
||||
.First();
|
||||
Logs.Write("协议处理5.2");
|
||||
if (storeInfo == null)
|
||||
{
|
||||
//TO DO 库位未找到
|
||||
return;
|
||||
}
|
||||
Logs.Write("协议处理5.3");
|
||||
//已放物料丢失了 物料多放了 储位恢复正常
|
||||
switch (data[TcpCleint.PreFixLength + 3])
|
||||
{
|
||||
@ -1077,12 +1090,10 @@ namespace WCS.BLL.HardWare
|
||||
});
|
||||
|
||||
ProcessingExceptions.RemoveAll(t => t.BoardId == boardId);
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
break;
|
||||
case 0x01:
|
||||
{
|
||||
Logs.Write("协议处理5.4");
|
||||
var exceptionMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
@ -1104,12 +1115,10 @@ namespace WCS.BLL.HardWare
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！"
|
||||
});
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
break;
|
||||
case 0x02:
|
||||
{
|
||||
Logs.Write("协议处理5.4");
|
||||
var exceptionMessage = storeInfo.StoreCode + "物料被取出！";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
@ -1131,7 +1140,6 @@ namespace WCS.BLL.HardWare
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = storeInfo.StoreCode + "入库过程中物料丢失！"
|
||||
});
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -1281,7 +1289,7 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
if (CurrentMode != Mode.出库模式)
|
||||
{
|
||||
Logs.Write($"出库错误：{ShelfCode}该货架模式不是出库模式或盘点模式！");
|
||||
Logs.Write($"出库错误：{ShelfCode}该货架模式不是出库模式或盘点模式！", LogsType.Outstore);
|
||||
return;
|
||||
}
|
||||
lightNumber = Convert.ToInt32(data[TcpCleint.PreFixLength + 3]);
|
||||
@ -1303,7 +1311,7 @@ namespace WCS.BLL.HardWare
|
||||
if (string.IsNullOrEmpty(storeInfo.CurrentMatSn))
|
||||
{
|
||||
//该库位是需要出库的库位，物料被多次取出or给了多个正常出库信号
|
||||
Logs.Write($"该库位是需要出库的库位，物料被反复取出or给了多个正常出库信号,库位{storeInfo.StoreCode}");
|
||||
Logs.Write($"该库位是需要出库的库位，物料被反复取出or给了多个正常出库信号,库位{storeInfo.StoreCode}", LogsType.Outstore);
|
||||
//暂不进行处理
|
||||
return;
|
||||
}
|
||||
@ -1311,7 +1319,7 @@ namespace WCS.BLL.HardWare
|
||||
//不是本次出库需要出的物料
|
||||
if (!CurrentOutStoreMatSNs.Contains(storeInfo.CurrentMatSn))
|
||||
{
|
||||
Logs.Write($"{storeInfo.CurrentMatSn}不是本次需要出库的物料");
|
||||
Logs.Write($"{storeInfo.CurrentMatSn}不是本次需要出库的物料", LogsType.Outstore);
|
||||
//报警灯报警
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
return;
|
||||
@ -1321,7 +1329,7 @@ namespace WCS.BLL.HardWare
|
||||
var inventoryDetail = DbHelp.db.Queryable<InventoryDetail>().Where(t => t.MatSN == storeInfo.CurrentMatSn).First();
|
||||
if (inventoryDetail == null)
|
||||
{
|
||||
Logs.Write($"{storeInfo.CurrentMatSn}库存信息不存在");
|
||||
Logs.Write($"{storeInfo.CurrentMatSn}库存信息不存在", LogsType.Outstore);
|
||||
//报警灯报警
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
return;
|
||||
@ -1335,7 +1343,7 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
if (orderMatDetails == null)
|
||||
{
|
||||
Logs.Write($"{storeInfo.CurrentMatSn},OrderDetail出库明细信息不存在");
|
||||
Logs.Write($"{storeInfo.CurrentMatSn},OrderDetail出库明细信息不存在", LogsType.Outstore);
|
||||
//报警灯报警
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
return;
|
||||
@ -1408,9 +1416,11 @@ namespace WCS.BLL.HardWare
|
||||
module.ComfirmOutstore(TcpCleint, data[TcpCleint.PreFixLength + 3]);
|
||||
|
||||
|
||||
|
||||
//当前柜子是否还存在未出库的
|
||||
Logs.Write($"货架【{ShelfCode}】，用户取出物料{matSN}", LogsType.Outstore);
|
||||
CurrentOutStoreMatSNs.RemoveAll(t => t == matSN);//删除本次已出的物料SN
|
||||
Logs.Write($"货架【{ShelfCode}】，当前货架剩余物料{string.Join(",", CurrentOutStoreMatSNs)}", LogsType.Outstore);
|
||||
|
||||
var isExsistOut = CurrentOutStoreMatSNs.Any();
|
||||
|
||||
var tempOrder = CurrentOutOrder;
|
||||
@ -1432,6 +1442,7 @@ namespace WCS.BLL.HardWare
|
||||
//本次亮灯的物料已全部取出
|
||||
if (!isExsistOut)
|
||||
{
|
||||
Logs.Write($"货架【{ShelfCode}】，本次亮灯的物料已全部取出", LogsType.Outstore);
|
||||
CurrentOutOrder = null;
|
||||
|
||||
//退出出库模式
|
||||
@ -1453,7 +1464,7 @@ namespace WCS.BLL.HardWare
|
||||
.Any();
|
||||
if (!isLastShelf)
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料");
|
||||
Logs.Write($"发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料", LogsType.Outstore);
|
||||
var outOrder = DbHelp.db.Queryable<OutOrder>()
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.First();
|
||||
@ -1468,7 +1479,7 @@ namespace WCS.BLL.HardWare
|
||||
if (outOrderMatDetails != null && outOrderMatDetails.Count > 0)
|
||||
{
|
||||
//存在待出库 然后之前又没亮灯的情况 => 继续分批次亮灯
|
||||
Logs.Write($"发料单{OrderNumber}，还有物料未出！");
|
||||
Logs.Write($"发料单{OrderNumber}，还有物料未出！", LogsType.Outstore);
|
||||
var outOrderDetailCount = outOrderMatDetails.GroupBy(t => t.MatCode)
|
||||
.Select(o => new { count = o.Count(), bb = o })
|
||||
.Where(o => o.count >= 2)
|
||||
@ -1480,13 +1491,13 @@ namespace WCS.BLL.HardWare
|
||||
var matCode = outOrderDetailCount.First().bb.Key;
|
||||
outOrderMatDetails = outOrderMatDetails.Where(t => t.MatCode == matCode)
|
||||
.ToList();
|
||||
Logs.Write($"发料单{OrderNumber}，本次亮灯物料{matCode}！");
|
||||
Logs.Write($"发料单{OrderNumber}，本次亮灯物料{matCode}！", LogsType.Outstore);
|
||||
}
|
||||
//相同物料不存在盘数超过n的情况，剩余物料全部亮灯
|
||||
else
|
||||
{
|
||||
//剩余物料全出
|
||||
Logs.Write($"发料单{OrderNumber}，剩余物料灯全亮！");
|
||||
Logs.Write($"发料单{OrderNumber}，剩余物料灯全亮！", LogsType.Outstore);
|
||||
}
|
||||
|
||||
var shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
|
||||
@ -1517,14 +1528,35 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！");
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，OutOrder为null，肯定是有问题");
|
||||
Logs.Write($"发料单{OrderNumber}，OutOrder为null，肯定是有问题", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，非最后一个出库货架！", LogsType.Outstore);
|
||||
var otherShelfs = ShelfManager.Shelves
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.Where(t => t.CurrentMode == Mode.出库模式)
|
||||
.ToList();
|
||||
|
||||
otherShelfs.ForEach(shelf =>
|
||||
{
|
||||
try
|
||||
{
|
||||
if (shelf is SmartShelf)
|
||||
{
|
||||
var smartShelf = (SmartShelf)shelf;
|
||||
Logs.Write($"货架【{smartShelf.ShelfCode}】待取物料{string.Join(",", smartShelf.CurrentOutStoreMatSNs)}", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
});
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
@ -57,11 +57,15 @@ namespace WCS.BLL.Manager
|
||||
{
|
||||
};
|
||||
});
|
||||
Logs.Write("【初始化数据库】MX", LogsType.StartBoot);
|
||||
}
|
||||
|
||||
|
||||
//手动修改后台配置后再进行CodeFirst 数据库的生成、表的生成
|
||||
if (LocalFile.Config.IsResetDBOrTable)
|
||||
{
|
||||
#region 建库建表 只在表有变动时运行
|
||||
DbHelp.db.DbMaintenance.CreateDatabase();
|
||||
DbHelp.dbLog.DbMaintenance.CreateDatabase();
|
||||
Logs.Write("【初始化数据库】创建数据库", LogsType.StartBoot);
|
||||
|
||||
DbHelp.db.CodeFirst.InitTables(typeof(ModuleInfo), typeof(ShelfInfo), typeof(StoreInfo)
|
||||
, typeof(InventoryDetail), typeof(OutOrder), typeof(OutOrderDetail), typeof(OutOrderMatDetail)
|
||||
@ -69,8 +73,10 @@ namespace WCS.BLL.Manager
|
||||
, typeof(StockTakingOrder), typeof(StockTakingOrderMatDetail), typeof(InOutRecord)
|
||||
, typeof(DocumentSerialNumber)
|
||||
);
|
||||
Logs.Write("【初始化数据库】db建表", LogsType.StartBoot);
|
||||
|
||||
DbHelp.dbLog.CodeFirst.InitTables(typeof(SystemApiLogRecord));
|
||||
Logs.Write("【初始化数据库】logdb建表", LogsType.StartBoot);
|
||||
|
||||
//初始化单据序列号数据
|
||||
if (!DbHelp.db.Queryable<DocumentSerialNumber>().Any())
|
||||
@ -92,6 +98,8 @@ namespace WCS.BLL.Manager
|
||||
DbHelp.db.Insertable(outDocumentSerialNumber).ExecuteCommand();
|
||||
DbHelp.db.Insertable(stockTakingDocumentSerialNumber).ExecuteCommand();
|
||||
}
|
||||
Logs.Write("【初始化数据库】DocumentSerialNumber", LogsType.StartBoot);
|
||||
|
||||
//初始化货架类型
|
||||
if (!DbHelp.db.Queryable<ShelfTypeInfo>().Any())
|
||||
{
|
||||
@ -106,11 +114,16 @@ namespace WCS.BLL.Manager
|
||||
DbHelp.db.Insertable(smartShelf).ExecuteCommand();
|
||||
DbHelp.db.Insertable(singleLight).ExecuteCommand();
|
||||
}
|
||||
|
||||
Logs.Write("【初始化数据库】结束", LogsType.StartBoot);
|
||||
Logs.Write("【初始化数据库】初始化货架类型", LogsType.StartBoot);
|
||||
|
||||
//初始化权限数据库
|
||||
AuthDbHelp.InitDb();
|
||||
#endregion
|
||||
|
||||
LocalFile.Config.IsResetDBOrTable = false;
|
||||
LocalFile.SaveConfig();
|
||||
}
|
||||
Logs.Write("【初始化数据库】结束", LogsType.StartBoot);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
using WCS.BLL.Config;
|
||||
using WCS.BLL.HardWare;
|
||||
using WCS.DAL.Db;
|
||||
using WCS.DAL.DbModels;
|
||||
@ -25,6 +26,7 @@ namespace WCS.BLL.Manager
|
||||
Logs.Write("【InitTcpClient】开始", LogsType.StartBoot);
|
||||
|
||||
var ips = DbHelp.db.Queryable<ShelfInfo>()
|
||||
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName),t => t.GroupName == LocalFile.Config.GroupName)
|
||||
.Select(t => t.ClientIp)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
@ -33,7 +35,6 @@ namespace WCS.BLL.Manager
|
||||
Task.Run(() =>
|
||||
{
|
||||
var tcpCleint = new TCPClient(ip, "");
|
||||
//配置断线重连
|
||||
tcpCleint.tcpClient.Received += (client, e) =>
|
||||
{
|
||||
var clientIpHost = client.IP + ":" + client.Port;
|
||||
@ -44,7 +45,7 @@ namespace WCS.BLL.Manager
|
||||
}
|
||||
|
||||
var data = e.ByteBlock.Buffer.Take((int)e.ByteBlock.Length).ToArray();
|
||||
Logs.Write($"【接收】{BitConverter.ToString(data)}",LogsType.Instructions);
|
||||
Logs.Write($"【接收】{BitConverter.ToString(data)}", LogsType.Instructions);
|
||||
e.ByteBlock.Clear();
|
||||
var len = data.Length;
|
||||
for (int index = 0; index < data.Length - TcpCleint.PreFixLength; index++)
|
||||
@ -78,7 +79,7 @@ namespace WCS.BLL.Manager
|
||||
{
|
||||
var shelf = ShelfManager.Shelves
|
||||
.Where(t => t.ClientIp == clientIpHost)
|
||||
.Where(t => t.ModuleIds.Contains(boardId))
|
||||
.Where(t => t.ModuleIds != null && t.ModuleIds.Contains(boardId))
|
||||
.FirstOrDefault();
|
||||
var smartShelf = shelf as SmartShelf;
|
||||
smartShelf?.ProtocolProcess(dataTemp, boardId, lightNumber);
|
||||
@ -101,6 +102,7 @@ namespace WCS.BLL.Manager
|
||||
if (TcpCleint.IsFirstConnected == false)
|
||||
{
|
||||
Logs.Write($"【InitTcpClient】{clientIpHost}完成首次连接", LogsType.StartBoot);
|
||||
Console.WriteLine($"【InitTcpClient】{clientIpHost}完成首次连接");
|
||||
InitStatus(TcpCleint);
|
||||
TcpCleint.IsFirstConnected = true;
|
||||
}
|
||||
@ -116,6 +118,8 @@ namespace WCS.BLL.Manager
|
||||
Task.Run(() =>
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
var noFirstConnectedClients = TCPClientManager.TCPClients.Where(t => t.IsFirstConnected == false)
|
||||
@ -126,14 +130,20 @@ namespace WCS.BLL.Manager
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine($"存在tcp未完成首次连接，继续重连！");
|
||||
noFirstConnectedClients.ForEach(t =>
|
||||
{
|
||||
t.ReConnectAsync();
|
||||
});
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
Logs.Write("【InitTcpClient】完成后台继续连接", LogsType.StartBoot);
|
||||
Logs.Write("【InitTcpClient】完成 后台继续连接", LogsType.StartBoot);
|
||||
}
|
||||
|
||||
//后台启动时给所有板子、警示灯发送复位操作 保持状态一致
|
||||
|
||||
552
WCS.BLL/Services/Service/InstoreService.cs.orig
Normal file
552
WCS.BLL/Services/Service/InstoreService.cs.orig
Normal file
@ -0,0 +1,552 @@
|
||||
using OracleInternal.SqlAndPlsqlParser.LocalParsing;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text.RegularExpressions;
|
||||
using WCS.BLL.Config;
|
||||
using WCS.BLL.DbModels;
|
||||
using WCS.BLL.HardWare;
|
||||
using WCS.BLL.Manager;
|
||||
using WCS.BLL.Services.IService;
|
||||
using WCS.BLL.Tool;
|
||||
using WCS.BLL.Tool.Api.ApiModel;
|
||||
using WCS.DAL.Db;
|
||||
using WCS.DAL.DbModels;
|
||||
using WCS.Model;
|
||||
using WCS.Model.ApiModel.InOutRecord;
|
||||
using WCS.Model.ApiModel.MXBackgroundThread;
|
||||
|
||||
namespace WCS.BLL.Services.Service
|
||||
{
|
||||
public class InstoreService : IInstoreService
|
||||
{
|
||||
public InstoreService() { }
|
||||
|
||||
public ResponseBase shelfGoInInStore(ShelfGoInInstoreRequest request)
|
||||
{
|
||||
//校验货架编码规则
|
||||
//取配置文件中得货架编码规则
|
||||
bool isValid = false;
|
||||
var patterns = LocalFile.Config.ModuleCodePatterns;
|
||||
if (patterns != null && patterns.Count > 0)
|
||||
{
|
||||
foreach (var pattern in patterns)
|
||||
{
|
||||
isValid = Regex.IsMatch(request.ModuleCode, pattern);
|
||||
//匹配到第一个符合条件的货架码 就直接退出循环 认为匹配成功
|
||||
if (isValid)
|
||||
break;
|
||||
}
|
||||
}
|
||||
//如果配置文件缺失 使用默认正则进行匹配
|
||||
else
|
||||
{
|
||||
isValid = Regex.IsMatch(request.ModuleCode, LocalFile.DefaultModuleCodePattern);
|
||||
}
|
||||
|
||||
if (!isValid)
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 202,
|
||||
Message = $"模组编码{request.ModuleCode}不满足模组编码规则！",
|
||||
};
|
||||
}
|
||||
//找到模组对应的货架
|
||||
var shelf = ShelfManager.Shelves.Where(t => t.ModulesStr.Contains(request.ModuleCode)).FirstOrDefault();
|
||||
if (shelf == null)//未找到
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 201,
|
||||
Message = "未找到模组对应的货架",
|
||||
};
|
||||
}
|
||||
//已找到模组对应货架
|
||||
shelf.GoInInstore(request.IpAdress);
|
||||
|
||||
if (shelf.CurrentMode == Mode.入库模式)
|
||||
//成功进入入库模式
|
||||
return new ShelfGoInInstoreResponse()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"货架进入入库模式成功！{string.Join(",", shelf.ExceptionMessages)}",
|
||||
Data = new ShelfGoInInstoreDto()
|
||||
{
|
||||
ShelfCode = shelf.ShelfCode,
|
||||
ModulesStr = shelf.ModulesStr,
|
||||
}
|
||||
};
|
||||
else
|
||||
return new ShelfGoInInstoreResponse()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"货架进入入库模式失败：{string.Join(",", shelf.ExceptionMessages)}",
|
||||
Data = null
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
public ResponseBase shelfGoOutInStore(ShelfGoOutInStoreRequest request)
|
||||
{
|
||||
//获取货架
|
||||
var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
|
||||
if (shelf == null)//货架不存在
|
||||
{
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"退出入库模式失败：货架[{request.ShelfCode}]不存在!",
|
||||
};
|
||||
}
|
||||
|
||||
//判断扫码枪 是否被其他扫码枪所占用 如果占用 直接退出入库模式 不发指令
|
||||
shelf.GoOutInstore();
|
||||
|
||||
if (shelf.ExceptionMessages == null || shelf.ExceptionMessages.Count == 0)
|
||||
//已退出
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"货架[{request.ShelfCode}]已退出入库模式!",
|
||||
};
|
||||
else
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"货架[{request.ShelfCode}]已退出入库模式!{string.Join(",", shelf.ExceptionMessages)}",
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<ResponseBase> queryByMatSn(QueryByMatSnRequest request)
|
||||
{
|
||||
//判断物料是否已入库
|
||||
var inventory = await DbHelp.db.Queryable<InventoryDetail>().Where(t => t.MatSN == request.MatSn).FirstAsync();
|
||||
if (inventory != null)
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：物料{inventory.MatSN}已入库!库位为{inventory.StoreCode}",
|
||||
};
|
||||
}
|
||||
|
||||
IShelfBase shelf = null;
|
||||
if (!request.SingleLightIn)
|
||||
{
|
||||
//获取货架
|
||||
shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
|
||||
if (shelf == null)//货架不存在
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：货架[{request.ShelfCode}]不存在!",
|
||||
};
|
||||
}
|
||||
//判断当前是否是入库模式
|
||||
if (shelf.CurrentMode != Mode.入库模式)
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：货架[{request.ShelfCode}]不在入库模式!\r\n当前为{shelf.CurrentMode}",
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#region 获取物料数据 //调用接口或者直接查询数据库
|
||||
// 调用接口
|
||||
if (LocalFile.Config.IsAccessWMS)
|
||||
{
|
||||
#region 调用WMS接口获取物料信息
|
||||
try
|
||||
{
|
||||
var body = new
|
||||
{
|
||||
materialBar = request.MatSn
|
||||
};
|
||||
var Result = ApiHelp.GetDataFromHttp<ResponseCommon<List<queryByBarResponse>>>("http://192.168.2.23:9213/integrate/instock/queryBybar", body, "POST", true);
|
||||
|
||||
//查询到物料信息
|
||||
if (Result != null && Result.Code == 200 && Result.Data != null && Result.Data.Count > 0)
|
||||
{
|
||||
var data = Result.Data.First();
|
||||
if (!request.SingleLightIn && shelf != null)
|
||||
shelf.InStoreData = new MatInfoResponse()
|
||||
{
|
||||
materialBar = data.materialBar,
|
||||
materialCode = data.materialCode,
|
||||
materialName = data.materialName,
|
||||
materialQty = data.materialQty,
|
||||
materialSpec = data.materialSpec,
|
||||
batchNo = data.batchNo,
|
||||
supplier = "",
|
||||
customer = "",
|
||||
|
||||
InstoreUser = request.UserName
|
||||
};
|
||||
|
||||
var matInfo = new MatInfo()
|
||||
{
|
||||
MatSn = data.materialBar,
|
||||
MatCode = data.materialCode,
|
||||
MatName = data.materialName,
|
||||
MatBatch = data.batchNo,
|
||||
MatQty = (int)data.materialQty,
|
||||
MatSpec = data.materialSpec,
|
||||
MatSupplier = "",
|
||||
MatCustomer = "",
|
||||
};
|
||||
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 200,
|
||||
Data = matInfo,
|
||||
Message = "success"
|
||||
};
|
||||
}
|
||||
else if (Result != null && Result.Code == 200 && Result.Data == null)
|
||||
{
|
||||
//Mes系统中未获取到物料信息
|
||||
|
||||
//简单校验看是否满足海康物料
|
||||
//海康物料 只扫了外箱码 未扫条码
|
||||
if ((request.MatSn.Length == 54 || request.MatSn.Length == 56) && !request.MatSn.Contains("\\") && !request.MatSn.Contains("/"))
|
||||
{
|
||||
|
||||
if (!request.SingleLightIn && shelf != null)
|
||||
shelf.InStoreData = new MatInfoResponse()
|
||||
{
|
||||
materialBar = request.MatSn,
|
||||
materialCode = "暂时未知",
|
||||
materialName = "暂时未知",
|
||||
materialQty = 0,
|
||||
materialSpec = "暂时未知",
|
||||
batchNo = "暂时未知",
|
||||
supplier = "",
|
||||
customer = "",
|
||||
|
||||
InstoreUser = request.UserName
|
||||
};
|
||||
|
||||
var matInfo = new MatInfo()
|
||||
{
|
||||
MatSn = request.MatSn,
|
||||
MatCode = "暂时未知",
|
||||
MatName = "暂时未知",
|
||||
MatBatch = "暂时未知",
|
||||
MatQty = 0,
|
||||
MatSpec = "暂时未知",
|
||||
MatSupplier = "",
|
||||
MatCustomer = "",
|
||||
};
|
||||
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 200,
|
||||
Data = matInfo,
|
||||
Message = "success"
|
||||
};
|
||||
}
|
||||
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：调用Mes接口未获取到物料信息！",
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：调用Mes接口失败！",
|
||||
};
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 300,
|
||||
Message = $"操作失败：调用Mes接口发生异常{e.Message}",
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
//查询数据库是否存在这个物料
|
||||
else
|
||||
{
|
||||
var matInfo = await DbHelp.db.Queryable<MatInfo>().Where(t => t.MatSn == request.MatSn).FirstAsync();
|
||||
if (matInfo != null)
|
||||
{
|
||||
//TODO 改成wcs的实体
|
||||
if (!request.SingleLightIn && shelf != null)
|
||||
shelf.InStoreData = new MatInfoResponse()
|
||||
{
|
||||
materialBar = matInfo.MatSn,
|
||||
materialCode = matInfo.MatCode,
|
||||
materialName = matInfo.MatName,
|
||||
materialQty = matInfo.MatQty,
|
||||
materialSpec = matInfo.MatSpec,
|
||||
batchNo = matInfo.MatBatch,
|
||||
supplier = matInfo.MatSupplier,
|
||||
customer = matInfo.MatCustomer,
|
||||
|
||||
InstoreUser = request.UserName
|
||||
};
|
||||
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 200,
|
||||
Data = matInfo,
|
||||
Message = "success"
|
||||
};
|
||||
}
|
||||
else
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Data = null,
|
||||
Message = $"不存在物料{request.MatSn}"
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 单灯出库时查询物料信息 这里返回库存的数据
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ResponseBase> queryByMatSnOut(QueryByMatSnRequest request)
|
||||
{
|
||||
//判断物料是否已入库
|
||||
var inventory = await DbHelp.db.Queryable<InventoryDetail>().Where(t => t.MatSN == request.MatSn).FirstAsync();
|
||||
if (inventory == null)
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"操作失败：物料不在库存内，无法进行出库！",
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
return new ResponseCommon<MatInfo>()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"Success",
|
||||
Data = new MatInfo()
|
||||
{
|
||||
MatSn = inventory.MatSN,
|
||||
MatCode = inventory.MatCode,
|
||||
MatName = inventory.MatName,
|
||||
MatBatch = inventory.MatBatch,
|
||||
MatQty = inventory.MatQty,
|
||||
MatSpec = inventory.MatSpec,
|
||||
MatSupplier = inventory.MatSupplier,
|
||||
MatCustomer = inventory.MatCustomer,
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ResponseBase> queryInstoreStatus(QueryByMatSnRequest request)
|
||||
{
|
||||
//获取货架
|
||||
var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
|
||||
if (shelf == null)//货架不存在
|
||||
{
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"货架[{request.ShelfCode}]不存在!",
|
||||
};
|
||||
}
|
||||
|
||||
//判断当前是否是入库模式
|
||||
if (shelf.CurrentMode != Mode.入库模式)
|
||||
{
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"货架[{request.ShelfCode}]已退出入库模式!\r\n当前为{shelf.CurrentMode}",
|
||||
};
|
||||
}
|
||||
|
||||
//TODO 配置这个时间相当于需要入库扫码后需要等待的时间
|
||||
var timeOut = 5000;
|
||||
var timeSpan = TimeSpan.FromMilliseconds(0);
|
||||
var beginTime = DateTime.Now;
|
||||
while (timeSpan <= TimeSpan.FromMilliseconds(timeOut))
|
||||
{
|
||||
timeSpan = DateTime.Now - beginTime;
|
||||
//已入库当前扫码的物料时 查询数据库
|
||||
if (shelf.InStoreData == null || (shelf.InStoreData as object) == null)
|
||||
{
|
||||
await Task.Delay(50);
|
||||
var inventoryDetail = DbHelp.db.Queryable<InventoryDetail>()
|
||||
.Where(t => t.MatSN == request.MatSn)
|
||||
.First();
|
||||
if (inventoryDetail != null)
|
||||
{
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"入库成功！物料已放入库位{inventoryDetail.StoreCode}",
|
||||
Data = new
|
||||
{
|
||||
StoreCode = inventoryDetail.StoreCode,
|
||||
}
|
||||
};
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
//延时处理
|
||||
Thread.Sleep(50);
|
||||
}
|
||||
//超时未成功入库
|
||||
shelf.InStoreData = null;
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"超时未入库！请重新扫码后入库！",
|
||||
Data = new
|
||||
{
|
||||
StoreCode = string.Empty,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<ResponseBase> queryInstoreStatusSingle(QueryByMatSnRequestSingle request)
|
||||
{
|
||||
//获取货架
|
||||
//var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
|
||||
//if (shelf == null)//货架不存在
|
||||
//{
|
||||
// return new ResponseCommon()
|
||||
// {
|
||||
// Code = 201,
|
||||
// Message = $"货架[{request.ShelfCode}]不存在!",
|
||||
// };
|
||||
//}
|
||||
List<ModuleInfo> MI = DbHelp.db.Queryable<ModuleInfo>().Where(it => it.ModuleCode == request.ShelfCode).ToList();
|
||||
if (MI.Count == 0)
|
||||
{
|
||||
return new ResponseCommonSingle()
|
||||
{
|
||||
Code = 201,
|
||||
Message = $"货架[{request.ShelfCode}]不存在!",
|
||||
};
|
||||
}
|
||||
ResponseCommonSingle rcs = new ResponseCommonSingle();
|
||||
rcs.Data = new List<Detail>();
|
||||
|
||||
string sendIP = MI[0].CleintIp; //单灯IP
|
||||
int PCBId = MI[0].BoardId; //单灯PCB板ID
|
||||
|
||||
List<StoreInfo> SI = DbHelp.db.Queryable<StoreInfo>().Where(it => it.ModuleCode == request.ShelfCode).ToList();
|
||||
|
||||
List<ShelfInfo> si = DbHelp.db.Queryable<ShelfInfo>().Where(it => it.ShelfCode == MI[0].ShelfCode).ToList();
|
||||
int warnLightID = si[0].LightId;
|
||||
|
||||
foreach (QueryByMatSnRequestSingle.MatSnListDetail matSnListDetail in request.MatSnList)
|
||||
{
|
||||
Detail detail = new Detail();
|
||||
try
|
||||
{
|
||||
InventoryDetail inventoryDetail = new InventoryDetail();
|
||||
inventoryDetail.MatSN = matSnListDetail.MatSn;
|
||||
inventoryDetail.MatCode = matSnListDetail.MatCode;
|
||||
inventoryDetail.MatName = matSnListDetail.MatName;
|
||||
inventoryDetail.MatSpec = matSnListDetail.MatSpec;
|
||||
inventoryDetail.MatBatch = matSnListDetail.MatBatch;
|
||||
inventoryDetail.MatQty = matSnListDetail.MatQty;
|
||||
inventoryDetail.MatCustomer = matSnListDetail.MatCustomer;
|
||||
inventoryDetail.MatSupplier = matSnListDetail.MatSupplier;
|
||||
inventoryDetail.StoreCode = request.ShelfCode;
|
||||
inventoryDetail.StoreId = SI[0].Id;
|
||||
|
||||
int count = DbHelp.db.Insertable(inventoryDetail).ExecuteCommand();
|
||||
|
||||
InOutRecord ior = new InOutRecord();
|
||||
ior.MatSN = matSnListDetail.MatSn;
|
||||
ior.MatCode = matSnListDetail.MatCode;
|
||||
ior.MatName = matSnListDetail.MatName;
|
||||
ior.MatSpec = matSnListDetail.MatSpec;
|
||||
ior.MatBatch = matSnListDetail.MatBatch;
|
||||
ior.MatQty = matSnListDetail.MatQty;
|
||||
ior.MatCustomer = matSnListDetail.MatCustomer;
|
||||
ior.MatSupplier = matSnListDetail.MatSupplier;
|
||||
ior.StoreCode = request.ShelfCode;
|
||||
ior.StoreId = SI[0].Id;
|
||||
ior.Direction = DirectionEnum.入库;
|
||||
ior.OperateTime = DateTime.Now;
|
||||
ior.OperateUser = request.UserName;
|
||||
int count1 = DbHelp.db.Insertable(ior).ExecuteCommand();
|
||||
|
||||
detail.matsn = matSnListDetail.MatSn;
|
||||
detail.result = "入库成功";
|
||||
rcs.Data.Add(detail);
|
||||
}
|
||||
catch (Exception ee)
|
||||
{
|
||||
detail.matsn = matSnListDetail.MatSn;
|
||||
detail.result = "入库失败";
|
||||
detail.reason = ee.Message;
|
||||
rcs.Data.Add(detail);
|
||||
}
|
||||
}
|
||||
//亮灯
|
||||
TCPClient tCPClient = TCPClientManager.GetTCPClientByIPHost(sendIP);
|
||||
<<<<<<< HEAD
|
||||
//byte[] data1 = new byte[8];
|
||||
//data1[0] = 0xff;
|
||||
//data1[1] = 0x02;
|
||||
//data1[2] = 0x00;
|
||||
//data1[3] = 0x0a;
|
||||
//data1[4] = (byte)warnLightID;
|
||||
//data1[5] = 0x03;
|
||||
//data1[6] = 0x02;
|
||||
//data1[7] = 0x02;
|
||||
//byte[] senddata1 = Tool.Helper.Crc16(data1, data1.Length, true);
|
||||
byte[] senddata1 = Tool.Helper.InstoreWarnLight(warnLightID);
|
||||
=======
|
||||
byte[] data1 = new byte[8];
|
||||
data1[0] = 0xff;
|
||||
data1[1] = 0x02;
|
||||
data1[2] = 0x00;
|
||||
data1[3] = 0x0a;
|
||||
data1[4] = (byte)warnLightID;
|
||||
data1[5] = 0x03;
|
||||
data1[6] = 0x02;
|
||||
data1[7] = 0x02;
|
||||
byte[] senddata1 = Tool.Helper.Crc16(data1, data1.Length, false);
|
||||
>>>>>>> 11
|
||||
tCPClient.Send(senddata1); //报警灯短亮一次
|
||||
|
||||
//byte[] data2 = new byte[8];
|
||||
//data2[0] = 0xff;
|
||||
//data2[1] = 0x01;
|
||||
//data2[2] = 0x00;
|
||||
//data2[3] = 0x0a;
|
||||
//data2[4] = 0x01;
|
||||
//data2[5] = (byte)PCBId;
|
||||
//data2[6] = 0x03;
|
||||
//data2[7] = 0x02;
|
||||
//byte[] senddata2 = Tool.Helper.Crc16(data2, data2.Length, true);
|
||||
byte[] senddata2 = Tool.Helper.InstoreLight(PCBId);
|
||||
tCPClient.Send(senddata2); //库位灯短亮一次
|
||||
|
||||
return new ResponseCommonSingle()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"入库成功！",
|
||||
Data = rcs.Data,
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -654,7 +654,7 @@ namespace WCS.BLL.Services.Service
|
||||
};
|
||||
}
|
||||
|
||||
if (request.IsStart)//&& order.OutOrderExeStatus != OutOrderExeStatus.发料完成
|
||||
if (request.IsStart)
|
||||
{
|
||||
order.OutOrderExeStatus = OutOrderExeStatus.开始发料;
|
||||
DbHelp.db.Updateable(order).ExecuteCommand();
|
||||
@ -690,13 +690,13 @@ namespace WCS.BLL.Services.Service
|
||||
var matCode = outOrderDetailCount.First().bb.Key;
|
||||
outOrderMatDetails = outOrderMatDetails.Where(t => t.MatCode == matCode)
|
||||
.ToList();
|
||||
Logs.Write($"出库单{order.OrderNumber}，本次亮灯物料{matCode}！");
|
||||
Logs.Write($"出库单{order.OrderNumber}，本次亮灯物料{matCode}！",LogsType.Outstore);
|
||||
}
|
||||
//相同物料不存在盘数超过n的情况，剩余物料全部亮灯
|
||||
else
|
||||
{
|
||||
//剩余物料全出
|
||||
Logs.Write($"出库单{order.OrderNumber}，剩余物料灯全亮！");
|
||||
Logs.Write($"出库单{order.OrderNumber}，剩余物料灯全亮！", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
|
||||
@ -708,6 +708,7 @@ namespace WCS.BLL.Services.Service
|
||||
.ToList();
|
||||
shelf.GoInOutstore(matDetails, order);
|
||||
shelf.OrderNumber = order.OrderNumber;
|
||||
Logs.Write($"出库单{order.OrderNumber}，货架{shelf.ShelfCode}进入入库模式！", LogsType.Outstore);
|
||||
});
|
||||
|
||||
//返回
|
||||
@ -720,6 +721,7 @@ namespace WCS.BLL.Services.Service
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logs.Write($"本次发料发生异常！{ex.Message}", LogsType.Outstore);
|
||||
await GoOutOutstore(request);
|
||||
throw ex;
|
||||
}
|
||||
@ -1108,16 +1110,12 @@ namespace WCS.BLL.Services.Service
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
//退出出库模式
|
||||
shelves.ForEach(t =>
|
||||
{
|
||||
t.GoOutOutstore();
|
||||
});
|
||||
|
||||
|
||||
|
||||
return new ResponseCommon()
|
||||
{
|
||||
Code = 200,
|
||||
|
||||
1311
WCS.BLL/Services/Service/OutstoreService.cs.orig
Normal file
1311
WCS.BLL/Services/Service/OutstoreService.cs.orig
Normal file
File diff suppressed because it is too large
Load Diff
53
WCS.BLL/Tool/DependencyExtensions.cs
Normal file
53
WCS.BLL/Tool/DependencyExtensions.cs
Normal file
@ -0,0 +1,53 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
|
||||
namespace WCS.BLL.Tool
|
||||
{
|
||||
/// <summary>
|
||||
/// 一个心跳计数器扩展。
|
||||
/// </summary>
|
||||
internal static class DependencyExtensions
|
||||
{
|
||||
public static readonly DependencyProperty<Timer> HeartbeatTimerProperty =
|
||||
DependencyProperty<Timer>.Register("HeartbeatTimer", null);
|
||||
|
||||
public static bool Ping<TClient>(this TClient client) where TClient : ITcpClientBase
|
||||
{
|
||||
try
|
||||
{
|
||||
var data = new byte[] { 0x05, 0x00, 0x00, 0x06, 0x78, 0x12, 0x34, 0x56, 0x78, 0x00, 0x00, 0x00, 0x00 };
|
||||
client.Send(data);
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logs.Write($"【{client.IP}:{client.Port}】发送心跳中发现异常：" + ex.Message, LogsType.Info);
|
||||
if (ex is NotConnectedException)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool Pong<TClient>(this TClient client) where TClient : ITcpClientBase
|
||||
{
|
||||
try
|
||||
{
|
||||
client.Send(new MyRequestInfo() { DataType = DataType.Pong }.PackageAsBytes());
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
client.Logger.Exception(ex);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
67
WCS.BLL/Tool/HeartbeatAndReceivePlugin.cs
Normal file
67
WCS.BLL/Tool/HeartbeatAndReceivePlugin.cs
Normal file
@ -0,0 +1,67 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
|
||||
namespace WCS.BLL.Tool
|
||||
{
|
||||
internal class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugin<ITcpClientBase>, ITcpDisconnectedPlugin<ITcpClientBase>, ITcpReceivedPlugin<ITcpClientBase>
|
||||
{
|
||||
private readonly int m_timeTick;
|
||||
private readonly ILog logger;
|
||||
|
||||
[DependencyInject("20000")]
|
||||
public HeartbeatAndReceivePlugin(int timeTick, ILog logger)
|
||||
{
|
||||
this.m_timeTick = 20000;
|
||||
this.logger = logger;
|
||||
}
|
||||
|
||||
|
||||
public async Task OnTcpConnected(ITcpClientBase client, ConnectedEventArgs e)
|
||||
{
|
||||
if (client is ISocketClient)
|
||||
{
|
||||
return;//此处可判断，如果为服务器，则不用使用心跳。
|
||||
}
|
||||
|
||||
if (client.GetValue(DependencyExtensions.HeartbeatTimerProperty) is Timer timer)
|
||||
{
|
||||
timer.Dispose();
|
||||
}
|
||||
|
||||
client.SetValue(DependencyExtensions.HeartbeatTimerProperty, new Timer((o) =>
|
||||
{
|
||||
client.Ping();
|
||||
}, null, 0, this.m_timeTick));
|
||||
await e.InvokeNext();
|
||||
}
|
||||
|
||||
public async Task OnTcpDisconnected(ITcpClientBase client, DisconnectEventArgs e)
|
||||
{
|
||||
if (client.GetValue(DependencyExtensions.HeartbeatTimerProperty) is Timer timer)
|
||||
{
|
||||
timer.Dispose();
|
||||
client.SetValue(DependencyExtensions.HeartbeatTimerProperty, null);
|
||||
}
|
||||
|
||||
await e.InvokeNext();
|
||||
}
|
||||
|
||||
public async Task OnTcpReceived(ITcpClientBase client, ReceivedDataEventArgs e)
|
||||
{
|
||||
if (e.RequestInfo is MyRequestInfo myRequest)
|
||||
{
|
||||
this.logger.Info(myRequest.ToString());
|
||||
if (myRequest.DataType == DataType.Ping)
|
||||
{
|
||||
client.Pong();
|
||||
}
|
||||
}
|
||||
await e.InvokeNext();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -36,7 +36,11 @@ namespace WCS.BLL
|
||||
/// <summary>
|
||||
/// 指令重发
|
||||
/// </summary>
|
||||
InstructionResend
|
||||
InstructionResend,
|
||||
/// <summary>
|
||||
/// 出库流程日志
|
||||
/// </summary>
|
||||
Outstore,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
85
WCS.BLL/Tool/MyFixedHeaderDataHandlingAdapter .cs
Normal file
85
WCS.BLL/Tool/MyFixedHeaderDataHandlingAdapter .cs
Normal file
@ -0,0 +1,85 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Core;
|
||||
|
||||
namespace WCS.BLL.Tool
|
||||
{
|
||||
|
||||
internal class MyFixedHeaderDataHandlingAdapter : CustomFixedHeaderDataHandlingAdapter<MyRequestInfo>
|
||||
{
|
||||
public override int HeaderLength => 3;
|
||||
|
||||
public override bool CanSendRequestInfo => false;
|
||||
|
||||
protected override MyRequestInfo GetInstance()
|
||||
{
|
||||
return new MyRequestInfo();
|
||||
}
|
||||
|
||||
protected override void PreviewSend(IRequestInfo requestInfo)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
internal class MyRequestInfo : IFixedHeaderRequestInfo
|
||||
{
|
||||
public DataType DataType { get; set; }
|
||||
public byte[] Data { get; set; }
|
||||
|
||||
public int BodyLength { get; private set; }
|
||||
|
||||
public bool OnParsingBody(byte[] body)
|
||||
{
|
||||
if (body.Length == this.BodyLength)
|
||||
{
|
||||
this.Data = body;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool OnParsingHeader(byte[] header)
|
||||
{
|
||||
if (header.Length == 3)
|
||||
{
|
||||
this.BodyLength = TouchSocketBitConverter.Default.ToUInt16(header, 0) - 1;
|
||||
this.DataType = (DataType)header[2];
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void Package(ByteBlock byteBlock)
|
||||
{
|
||||
byteBlock.Write((ushort)((this.Data == null ? 0 : this.Data.Length) + 1));
|
||||
byteBlock.Write((byte)this.DataType);
|
||||
if (this.Data != null)
|
||||
{
|
||||
byteBlock.Write(this.Data);
|
||||
}
|
||||
}
|
||||
|
||||
public byte[] PackageAsBytes()
|
||||
{
|
||||
using var byteBlock = new ByteBlock();
|
||||
this.Package(byteBlock);
|
||||
return byteBlock.ToArray();
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"数据类型={this.DataType}，数据={(this.Data == null ? "null" : Encoding.UTF8.GetString(this.Data))}";
|
||||
}
|
||||
}
|
||||
|
||||
internal enum DataType : byte
|
||||
{
|
||||
Ping,
|
||||
Pong,
|
||||
Data
|
||||
}
|
||||
}
|
||||
@ -2,6 +2,7 @@
|
||||
using System.Text;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
using WCS.BLL.Tool;
|
||||
|
||||
|
||||
namespace WCS.BLL
|
||||
@ -68,6 +69,7 @@ namespace WCS.BLL
|
||||
{
|
||||
//配置断线重连
|
||||
a.UseReconnection(-1, true, 1000);
|
||||
a.Add<HeartbeatAndReceivePlugin>();
|
||||
})
|
||||
.ConfigureContainer(a =>
|
||||
{
|
||||
|
||||
15
WCS.Model/ApiModel/Home/ResetShelfStatusRequest.cs
Normal file
15
WCS.Model/ApiModel/Home/ResetShelfStatusRequest.cs
Normal file
@ -0,0 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace WCS.Model.ApiModel.Home
|
||||
{
|
||||
public class ResetShelfStatusRequest : RequestBase
|
||||
{
|
||||
public List<int> SelfIds { get; set; }
|
||||
|
||||
public bool IsResetAll { get; set; }
|
||||
|
||||
public List<string> GroupNames { get; set; }
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SqlSugar;
|
||||
using WCS.BLL.DbModels;
|
||||
using WCS.BLL.HardWare;
|
||||
using WCS.BLL.Manager;
|
||||
using WCS.BLL.Services.IService;
|
||||
using WCS.BLL.Services.Service;
|
||||
@ -85,9 +86,71 @@ namespace WCS.WebApi.Controllers
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return null;
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 300,
|
||||
Message = "获取失败：" + ex.Message,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重置货架的状态 使其回到待机模式
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[Route("resetShelfStatus")]
|
||||
[HttpPost(Name = "resetShelfStatus")]
|
||||
public async Task<ResponseBase> resetShelfStatus(ResetShelfStatusRequest request)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (request.IsResetAll == false && (request.SelfIds == null || request.SelfIds.Count == 0))
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 201,
|
||||
Message = "复位失败：请选择需要复位的货架！",
|
||||
};
|
||||
}
|
||||
if (request.IsResetAll == true && (request.GroupNames == null || request.GroupNames.Count == 0))
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 201,
|
||||
Message = "复位失败：请选择需要复位的货架区域！",
|
||||
};
|
||||
}
|
||||
var shelfs = new List<IShelfBase>();
|
||||
if (request.IsResetAll == false)
|
||||
shelfs = ShelfManager.Shelves
|
||||
.Where(t => request.SelfIds.Contains(t.ShelfId))
|
||||
.Where(t => t.CurrentMode != Mode.待机模式)
|
||||
.ToList();
|
||||
else
|
||||
shelfs = ShelfManager.Shelves
|
||||
.Where(t => request.GroupNames.Contains(t.GroupName))
|
||||
.Where(t => t.CurrentMode != Mode.待机模式)
|
||||
.ToList();
|
||||
foreach (var shelf in shelfs)
|
||||
{
|
||||
shelf.Reset();
|
||||
}
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 200,
|
||||
Message = "success",
|
||||
};
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 300,
|
||||
Message = ex.Message,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,5 +24,7 @@ namespace WCS.WebApi.Controllers
|
||||
{
|
||||
return await _warningService.SolveWarning(request);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,533 +9,45 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using WCS.Model;
|
||||
using WCS.Model.ApiModel.Home;
|
||||
using 货架标准上位机.Api;
|
||||
|
||||
namespace 货架标准上位机.ViewModel
|
||||
{
|
||||
public class DeviceViewModel : BindableBase
|
||||
{
|
||||
//循环间隙时间
|
||||
int whileSleep = 1500;
|
||||
public ICommand ResetAllShelfCommand { get => new DelegateCommand(ResetAllShelf); }
|
||||
/// <summary>
|
||||
/// 是否繁忙。繁忙状态下不在进行定时刷新操作。
|
||||
/// 打开用户
|
||||
/// </summary>
|
||||
public bool IsBusy { get; set; } = false;
|
||||
//public IIoTBase plc;
|
||||
|
||||
#region 属性
|
||||
/// <summary>
|
||||
/// 监听
|
||||
/// </summary>
|
||||
public IEnumerable<DeviceReadModel> DataReads { get; set; }
|
||||
/// <summary>
|
||||
/// 控制
|
||||
/// </summary>
|
||||
public IEnumerable<DeviceWriteModel> DataWrites { get; set; }
|
||||
/// <summary>
|
||||
/// 气缸
|
||||
/// </summary>
|
||||
public IEnumerable<DeviceUrnModel> DataUrns { get; set; }
|
||||
/// <summary>
|
||||
/// 伺服
|
||||
/// </summary>
|
||||
public IEnumerable<DeviceServoModel> DataServos { get; set; }
|
||||
|
||||
private bool IsVis_ = false;
|
||||
/// <summary>
|
||||
/// 当前页面是否显示
|
||||
/// </summary>
|
||||
public bool IsVis { get => IsVis_; set { SetProperty(ref IsVis_, value); } }
|
||||
|
||||
#region 是否展示
|
||||
private bool IsVisRead_ = true;
|
||||
public bool IsVisRead { get => IsVisRead_; set { SetProperty(ref IsVisRead_, value); } }
|
||||
|
||||
private bool IsVisWrite_ = true;
|
||||
public bool IsVisWrite { get => IsVisWrite_; set { SetProperty(ref IsVisWrite_, value); } }
|
||||
|
||||
private bool IsVisUrn_ = true;
|
||||
public bool IsVisUrn { get => IsVisUrn_; set { SetProperty(ref IsVisUrn_, value); } }
|
||||
|
||||
private bool IsVisServo_ = true;
|
||||
public bool IsVisServo { get => IsVisServo_; set { SetProperty(ref IsVisServo_, value); } }
|
||||
#endregion
|
||||
|
||||
#region 是否折叠
|
||||
private bool IsVisExpRead_ = true;
|
||||
public bool IsVisExpRead { get => IsVisExpRead_; set { SetProperty(ref IsVisExpRead_, value); } }
|
||||
|
||||
private bool IsVisExpWrite_ = true;
|
||||
public bool IsVisExpWrite { get => IsVisExpWrite_; set { SetProperty(ref IsVisExpWrite_, value); } }
|
||||
|
||||
private bool IsVisExpUrn_ = false;
|
||||
public bool IsVisExpUrn { get => IsVisExpUrn_; set { SetProperty(ref IsVisExpUrn_, value); } }
|
||||
|
||||
private bool IsVisExpServo_ = false;
|
||||
public bool IsVisExpServo { get => IsVisExpServo_; set { SetProperty(ref IsVisExpServo_, value); } }
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 循环读取数据
|
||||
/// </summary>
|
||||
public async void WhileRead()
|
||||
public void ResetAllShelf()
|
||||
{
|
||||
while (true)
|
||||
#region 调用接口 请求重置所有货架的状态
|
||||
var body = new ResetShelfStatusRequest()
|
||||
{
|
||||
try
|
||||
IsResetAll = true,
|
||||
GroupNames = LocalFile.Config.GroupName,
|
||||
UserName = LocalStatic.CurrentUser,
|
||||
DeviceType = LocalFile.Config.DeviceType,
|
||||
};
|
||||
var Result = ApiHelp.GetDataFromHttp<ResponseBase>(LocalFile.Config.ApiIpHost + "home/resetShelfStatus", body, "POST");
|
||||
if (Result != null && Result.Code == 200)
|
||||
{
|
||||
if (!IsVis || IsBusy)
|
||||
{
|
||||
await Task.Delay(whileSleep);
|
||||
continue;
|
||||
Growl.Warning("复位成功！");
|
||||
}
|
||||
|
||||
////监控
|
||||
if (DataReads != null && IsVisExpRead)
|
||||
else if (Result != null)
|
||||
{
|
||||
foreach (var item in DataReads)
|
||||
{
|
||||
if (!item.IsExpanded)
|
||||
continue;
|
||||
|
||||
var plcAdd = item.ExcelTag;
|
||||
if (string.IsNullOrWhiteSpace(plcAdd.地址))
|
||||
continue;
|
||||
|
||||
var ts = plcAdd.类型.Trim().ToLower();
|
||||
switch (ts)
|
||||
{
|
||||
case "bool":
|
||||
//var datab = plc?.Read<bool>(plcAdd.地址);
|
||||
//item.Value = datab?.IsSucceed == true ? datab.Value : false;
|
||||
break;
|
||||
case "byte":
|
||||
//var datay = plc?.Read<byte>(plcAdd.地址);
|
||||
//item.Value = datay?.IsSucceed == true ? datay.Value : "-";
|
||||
break;
|
||||
case "int16":
|
||||
//var datai16 = plc?.Read<Int16>(plcAdd.地址);
|
||||
//item.Value = datai16?.IsSucceed == true ? datai16.Value : "-";
|
||||
break;
|
||||
case "int32":
|
||||
//var datai32 = plc?.Read<int>(plcAdd.地址);
|
||||
//item.Value = datai32?.IsSucceed == true ? datai32.Value : "-";
|
||||
break;
|
||||
case "uint16":
|
||||
//var dataui16 = plc?.Read<UInt16>(plcAdd.地址);
|
||||
//item.Value = dataui16?.IsSucceed == true ? dataui16.Value : "-";
|
||||
break;
|
||||
case "uint32":
|
||||
//var dataui32 = plc?.Read<UInt32>(plcAdd.地址);
|
||||
//item.Value = dataui32?.IsSucceed == true ? dataui32.Value : "-";
|
||||
break;
|
||||
case "float":
|
||||
case "single":
|
||||
//var datas = plc?.Read<float>(plcAdd.地址);
|
||||
//item.Value = datas?.IsSucceed == true ? datas.Value : "-";
|
||||
break;
|
||||
case "double":
|
||||
//var datad = plc?.Read<double>(plcAdd.地址);
|
||||
//item.Value = datad?.IsSucceed == true ? datad.Value : "-";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////控制
|
||||
if (DataWrites != null && IsVisExpWrite)
|
||||
{
|
||||
foreach (var item in DataWrites)
|
||||
{
|
||||
if (!item.IsExpanded)
|
||||
continue;
|
||||
|
||||
var plcAdd = item.ExcelTag;
|
||||
if (string.IsNullOrWhiteSpace(plcAdd.读地址))
|
||||
continue;
|
||||
|
||||
var ts = plcAdd.类型.Trim().ToLower();
|
||||
switch (ts)
|
||||
{
|
||||
case "bool":
|
||||
//var datab = plc?.Read<bool>(plcAdd.读地址);
|
||||
//item.Value = datab?.IsSucceed == true ? datab.Value : false;
|
||||
break;
|
||||
case "byte":
|
||||
//var datay = plc?.Read<byte>(plcAdd.读地址);
|
||||
//item.Value = datay?.IsSucceed == true ? datay.Value : "-";
|
||||
break;
|
||||
case "int16":
|
||||
//var datai16 = plc?.Read<Int16>(plcAdd.读地址);
|
||||
//item.Value = datai16?.IsSucceed == true ? datai16.Value : "-";
|
||||
break;
|
||||
case "int32":
|
||||
//var datai32 = plc?.Read<int>(plcAdd.读地址);
|
||||
//item.Value = datai32?.IsSucceed == true ? datai32.Value : "-";
|
||||
break;
|
||||
case "uint16":
|
||||
//var dataui16 = plc?.Read<UInt16>(plcAdd.读地址);
|
||||
//item.Value = dataui16?.IsSucceed == true ? dataui16.Value : "-";
|
||||
break;
|
||||
case "uint32":
|
||||
//var dataui32 = plc?.Read<UInt32>(plcAdd.读地址);
|
||||
//item.Value = dataui32?.IsSucceed == true ? dataui32.Value : "-";
|
||||
break;
|
||||
case "float":
|
||||
case "single":
|
||||
//var datas = plc?.Read<float>(plcAdd.读地址);
|
||||
//item.Value = datas?.IsSucceed == true ? datas.Value : "-";
|
||||
break;
|
||||
case "double":
|
||||
//var datad = plc?.Read<double>(plcAdd.读地址);
|
||||
//item.Value = datad?.IsSucceed == true ? datad.Value : "-";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////气缸
|
||||
if (DataUrns != null && IsVisExpUrn)
|
||||
{
|
||||
foreach (var item in DataUrns)
|
||||
{
|
||||
if (!item.IsExpanded)
|
||||
continue;
|
||||
|
||||
var plcAdd = item.ExcelTag;
|
||||
if (!string.IsNullOrWhiteSpace(plcAdd.推到位地址))
|
||||
{
|
||||
//var data1 = plc?.Read<bool>(plcAdd.推到位地址);
|
||||
//item.IsGoTo = data1?.IsSucceed == true ? data1.Value : false;
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(plcAdd.回到位地址))
|
||||
{
|
||||
//var data2 = plc?.Read<bool>(plcAdd.回到位地址);
|
||||
//item.IsRetTo = data2?.IsSucceed == true ? data2.Value : false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////伺服
|
||||
if (DataServos != null && IsVisExpServo)
|
||||
{
|
||||
foreach (var item in DataServos)
|
||||
{
|
||||
if (!item.IsExpanded)
|
||||
continue;
|
||||
|
||||
////读取地址信息
|
||||
var plcAdd = item.ExcelTag;
|
||||
if (!string.IsNullOrWhiteSpace(plcAdd.当前位置获取))
|
||||
{
|
||||
//var data1 = plc?.Read<float>(plcAdd.当前位置获取);
|
||||
//item.Location = data1?.IsSucceed == true ? data1.Value : 0;
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(plcAdd.手动速度获取) && (item.IsJog || !item.IsFold))
|
||||
{
|
||||
//var data2 = plc?.Read<Int16>(plcAdd.手动速度获取);
|
||||
//item.JogSpeed = data2?.IsSucceed == true ? data2.Value : 0;
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(plcAdd.自动速度设置) && (!item.IsJog || !item.IsFold))
|
||||
{
|
||||
//var data3 = plc?.Read<Int16>(plcAdd.自动速度设置);
|
||||
//item.AutoSpeed = data3?.IsSucceed == true ? data3.Value : 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await Task.Delay(whileSleep);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*一起选中【操作控制】【操作气缸】【操作伺服】可以快速解开全部注释*/
|
||||
|
||||
#region 操作控制
|
||||
////单击
|
||||
public void WriteClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceWriteModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (dataExcel.类型.Trim().ToLower() == "bool" && mode.StartsWith("切换"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
var boolval = data.Value is true;
|
||||
//plc?.Write(dataExcel.写地址, !boolval);
|
||||
data.Value = !boolval;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "控制", Funct = string.Empty, Val = data.Value, Mode = mode });
|
||||
});
|
||||
Growl.Warning(Result.Message);
|
||||
}
|
||||
else
|
||||
{
|
||||
var ts = dataExcel.类型.Trim().ToLower();
|
||||
switch (ts)
|
||||
{
|
||||
case "byte":
|
||||
WriteClickDialog<byte>(data);
|
||||
break;
|
||||
case "int16":
|
||||
WriteClickDialog<Int16>(data);
|
||||
break;
|
||||
case "int32":
|
||||
WriteClickDialog<Int32>(data);
|
||||
break;
|
||||
case "uint16":
|
||||
WriteClickDialog<UInt16>(data);
|
||||
break;
|
||||
case "uint32":
|
||||
WriteClickDialog<UInt32>(data);
|
||||
break;
|
||||
case "float":
|
||||
case "single":
|
||||
WriteClickDialog<float>(data);
|
||||
break;
|
||||
case "double":
|
||||
WriteClickDialog<double>(data);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////单击弹框
|
||||
void WriteClickDialog<T>(DeviceWriteModel data) where T : struct
|
||||
{
|
||||
var dataExcel = data.ExcelTag;
|
||||
var val = TipInputView.Show<T>($"请输入新的[{dataExcel.名称}]值：", "修改值", "请输入值");
|
||||
if (!val.HasValue)
|
||||
return;
|
||||
|
||||
//plc?.Write<T>(dataExcel.写地址, val.Value);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "控制", Funct = string.Empty, Val = val.Value, Mode = "" });
|
||||
}
|
||||
|
||||
////按下左键
|
||||
public void LeftDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var data = (DeviceWriteModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (dataExcel.类型.Trim().ToLower() == "bool" && mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.写地址, true);
|
||||
data.Value = true;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "控制", Funct = string.Empty, Val = data.Value, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////放开左键
|
||||
public void LeftUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var data = (DeviceWriteModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (dataExcel.类型.Trim().ToLower() == "bool" && mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.写地址, false);
|
||||
data.Value = false;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "控制", Funct = string.Empty, Val = data.Value, Mode = mode });
|
||||
});
|
||||
}
|
||||
Growl.Warning("调用接口失败！");
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 操作气缸
|
||||
////按钮1单击
|
||||
public void Button1_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("切换"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.推地址, true);
|
||||
//plc?.Write(dataExcel.回地址, false);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "推", Val = true, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////按钮1按下
|
||||
public void But1ClickDown(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.推地址, true);
|
||||
data.IsGoTo = true;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "推", Val = true, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////按钮1松开
|
||||
public void But1ClickUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.推地址, false);
|
||||
data.IsGoTo = false;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "推", Val = false, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////按钮2单击
|
||||
public void Button2_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("切换"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.推地址, false);
|
||||
//plc?.Write(dataExcel.回地址, true);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "回", Val = true, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////按钮2按下
|
||||
public void But2ClickDown(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.回地址, true);
|
||||
data.IsRetTo = true;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "回", Val = true, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
////按钮2松开
|
||||
public void But2ClickUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceUrnModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = dataExcel.点动切换?.Trim() ?? "";
|
||||
|
||||
if (mode.StartsWith("点动"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
//plc?.Write(dataExcel.回地址, false);
|
||||
data.IsRetTo = false;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "气缸", Funct = "回", Val = false, Mode = mode });
|
||||
});
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 操作伺服
|
||||
////尝试改变伺服的位置时
|
||||
public void LocationChange(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceServoModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = string.Empty;
|
||||
|
||||
////运动方式
|
||||
if (e.OriginalSource is ServoClickType servoClickType)
|
||||
{
|
||||
if (servoClickType == ServoClickType.StartDotAdd)
|
||||
{
|
||||
//plc?.Write(dataExcel.位置点动加, true);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "开始点动加", Val = true, Mode = mode });
|
||||
}
|
||||
else if (servoClickType == ServoClickType.EndDotAdd)
|
||||
{
|
||||
//plc?.Write(dataExcel.位置点动加, false);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "结束点动加", Val = false, Mode = mode });
|
||||
}
|
||||
else if (servoClickType == ServoClickType.StartDotSub)
|
||||
{
|
||||
//plc?.Write(dataExcel.位置点动减, true);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "开始点动减", Val = true, Mode = mode });
|
||||
}
|
||||
else if (servoClickType == ServoClickType.EndDotSub)
|
||||
{
|
||||
//plc?.Write(dataExcel.位置点动减, false);
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "结束点动减", Val = false, Mode = mode });
|
||||
}
|
||||
}
|
||||
////运动到指定位置
|
||||
else if (e.OriginalSource is double val)
|
||||
{
|
||||
//plc?.Write(dataExcel.位置移动, Convert.ToSingle(val));
|
||||
data.Location = val;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "位置移动", Val = val, Mode = mode });
|
||||
}
|
||||
}
|
||||
|
||||
////尝试改变伺服的速度时
|
||||
public void SpeedChange(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var data = (DeviceServoModel)((FrameworkElement)sender).DataContext;
|
||||
var dataExcel = data.ExcelTag;
|
||||
var mode = string.Empty;
|
||||
|
||||
var data2 = (ServoSpeed)e.OriginalSource;
|
||||
if (data2.Name.StartsWith("手动"))
|
||||
{
|
||||
//plc?.Write(dataExcel.手动速度设置, Convert.ToSingle(data2.Speed));
|
||||
data.JogSpeed = data2.Speed;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "手动速度设置", Val = data2.Speed, Mode = mode });
|
||||
}
|
||||
else
|
||||
{
|
||||
//plc?.Write(dataExcel.自动速度设置, Convert.ToSingle(data2.Speed));
|
||||
data.AutoSpeed = data2.Speed;
|
||||
IotDevice.UserChange?.Invoke(new IotDevice() { Name = data.Name, Type = "伺服", Funct = "自动速度设置", Val = data2.Speed, Mode = mode });
|
||||
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
public class DeviceReadModel : BindableBase
|
||||
{
|
||||
#region 属性
|
||||
|
||||
@ -13,126 +13,14 @@
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<GroupBox Header="模式选择" Margin="3" Style="{StaticResource GroupBoxTab}">
|
||||
<GroupBox Header="调试功能" Margin="3" Style="{StaticResource GroupBoxTab}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Button Margin="5,3" Padding="30,0" Content="初始化"></Button>
|
||||
<Button Margin="5,3" Padding="30,0" Name="resetShelf" Content="货架状态初始化" Command="{Binding ResetAllShelfCommand}"></Button>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
|
||||
<hc:ScrollViewer Grid.Row="1" Margin="3,3" IsInertiaEnabled="True" hc:ScrollViewerAttach.AutoHide="True">
|
||||
<StackPanel Margin="0" Orientation="Vertical">
|
||||
<!--监听-->
|
||||
<Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow1}" Visibility="{Binding IsVisRead,Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
<Expander Style="{StaticResource BaseStyle}" Margin="0" Header="监听" IsExpanded="{Binding IsVisExpRead}">
|
||||
<hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
|
||||
<!--<local:IotReadListView Margin="0,10,0,0" Data="{Binding DataRead}"/>-->
|
||||
<StackPanel x:Name="stackPanel1">
|
||||
<StackPanel.Resources>
|
||||
<ResourceDictionary>
|
||||
<Style TargetType="pi:IotStateInfo" BasedOn="{StaticResource IotStateInfoStyle}">
|
||||
<Setter Property="Width" Value="150"></Setter>
|
||||
<Setter Property="Margin" Value="3,1"></Setter>
|
||||
<!--<Setter Property="BorderThickness" Value="1"></Setter>-->
|
||||
<Setter Property="Opacity" Value="0.8"></Setter>
|
||||
<Setter Property="OkBrush" Value="DarkTurquoise"></Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</StackPanel.Resources>
|
||||
<WrapPanel>
|
||||
<pi:IotStateInfo Header="传感器1" Value="false"></pi:IotStateInfo>
|
||||
<pi:IotStateInfo Header="传感器2" Value="True"></pi:IotStateInfo>
|
||||
</WrapPanel>
|
||||
<Expander Header="分组1" IsExpanded="True" BorderThickness="0" Background="{StaticResource DefaultBrush}">
|
||||
<WrapPanel>
|
||||
<pi:IotStateInfo Header="温度1" Value="1.23"></pi:IotStateInfo>
|
||||
</WrapPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</hc:TransitioningContentControl>
|
||||
</Expander>
|
||||
</Border>
|
||||
<!--控制-->
|
||||
<Border Margin="0,10,0,0" Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow1}" Visibility="{Binding IsVisWrite,Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
<Expander Style="{StaticResource BaseStyle}" Margin="0" Header="控制" IsExpanded="{Binding IsVisExpWrite}">
|
||||
<hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
|
||||
<!--<local:IotWriteListView Margin="0,10,0,0" Data="{Binding DataWrite}"/>-->
|
||||
<StackPanel x:Name="stackPanel2">
|
||||
<StackPanel.Resources>
|
||||
<ResourceDictionary>
|
||||
<Style TargetType="pi:IotStateInfo" BasedOn="{StaticResource IotStateInfoStyle}">
|
||||
<Setter Property="Width" Value="150"></Setter>
|
||||
<Setter Property="Margin" Value="3,1"></Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</StackPanel.Resources>
|
||||
<WrapPanel>
|
||||
<pi:IotStateInfo Header="传感器1" Value="false"></pi:IotStateInfo>
|
||||
<pi:IotStateInfo Header="传感器2" Value="True"></pi:IotStateInfo>
|
||||
</WrapPanel>
|
||||
<Expander Header="分组1" IsExpanded="True" BorderThickness="0" Background="{StaticResource DefaultBrush}">
|
||||
<WrapPanel>
|
||||
<pi:IotStateInfo Header="温度1" Value="1.23"></pi:IotStateInfo>
|
||||
</WrapPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</hc:TransitioningContentControl>
|
||||
</Expander>
|
||||
</Border>
|
||||
<!--气缸-->
|
||||
<Border Margin="0,10,0,0" Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow1}" Visibility="{Binding IsVisUrn,Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
<Expander Style="{StaticResource BaseStyle}" Margin="0" Header="气缸" IsExpanded="{Binding IsVisExpUrn}">
|
||||
<hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
|
||||
<!--<local:IotUrnListView Margin="0,10,0,0" Data="{Binding DataUrn}"/>-->
|
||||
<StackPanel x:Name="stackPanel3">
|
||||
<StackPanel.Resources>
|
||||
<ResourceDictionary>
|
||||
<Style TargetType="pi:IotUrnMode" BasedOn="{StaticResource IotUrnModeStyle}">
|
||||
<Setter Property="Margin" Value="3,1"></Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</StackPanel.Resources>
|
||||
<WrapPanel>
|
||||
<pi:IotUrnMode Text="气缸1"></pi:IotUrnMode>
|
||||
<pi:IotUrnMode Text="气缸1" IsButBadge1="True"></pi:IotUrnMode>
|
||||
</WrapPanel>
|
||||
<Expander Header="分组1" IsExpanded="True" BorderThickness="0" Background="{StaticResource DefaultBrush}">
|
||||
<WrapPanel>
|
||||
<pi:IotUrnMode Text="气缸1"></pi:IotUrnMode>
|
||||
</WrapPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</hc:TransitioningContentControl>
|
||||
</Expander>
|
||||
</Border>
|
||||
<!--伺服-->
|
||||
<Border Margin="0,10,0,0" Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow1}" Visibility="{Binding IsVisServo,Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
<Expander Style="{StaticResource BaseStyle}" Margin="0" Header="伺服" IsExpanded="{Binding IsVisExpServo}">
|
||||
<hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
|
||||
<!--<local:IotServoListView Margin="0,10,0,0" Data="{Binding DataServo}"/>-->
|
||||
<StackPanel x:Name="stackPanel4">
|
||||
<StackPanel.Resources>
|
||||
<ResourceDictionary>
|
||||
<Style TargetType="pi:IotServoMode" BasedOn="{StaticResource IotServoModeStyle}">
|
||||
<Setter Property="Margin" Value="3,1"></Setter>
|
||||
<Setter Property="VerticalAlignment" Value="Top"></Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</StackPanel.Resources>
|
||||
<WrapPanel>
|
||||
<pi:IotServoMode Text="伺服1"/>
|
||||
<pi:IotServoMode Text="伺服1"/>
|
||||
</WrapPanel>
|
||||
<Expander Header="分组1" IsExpanded="True" BorderThickness="0" Background="{StaticResource DefaultBrush}">
|
||||
<WrapPanel>
|
||||
<pi:IotServoMode Text="伺服1"/>
|
||||
<pi:IotServoMode Text="伺服1"/>
|
||||
</WrapPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</hc:TransitioningContentControl>
|
||||
</Expander>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
|
||||
</hc:ScrollViewer>
|
||||
</Grid>
|
||||
</pi:UserControlBase>
|
||||
|
||||
@ -29,362 +29,19 @@ namespace 货架标准上位机
|
||||
public DeviceView()
|
||||
{
|
||||
InitializeComponent();
|
||||
//viewModel.plc = LocalStatic.Plc;
|
||||
this.DataContext = viewModel;
|
||||
}
|
||||
|
||||
//第一次显示，渲染Ui
|
||||
private void visfir(object sender, EventArgs e)
|
||||
{
|
||||
if (IsInDesignMode)
|
||||
return;
|
||||
|
||||
if (!System.IO.File.Exists(LocalFile.PlcDotPath))
|
||||
{
|
||||
Growl.Info($"没有找到文档[{LocalFile.PlcDotPath}]，请联系管理员。");
|
||||
return;
|
||||
}
|
||||
|
||||
//读Excel
|
||||
viewModel.DataReads = ExcelDeviceReadModel.GetDatas();
|
||||
viewModel.DataWrites = ExcelDeviceWriteModel.GetDatas();
|
||||
viewModel.DataUrns = ExcelDeviceUrnModel.GetDatas();
|
||||
viewModel.DataServos = ExcelDeviceServoModel.GetDatas();
|
||||
|
||||
//加载页面
|
||||
ReadUi(viewModel.DataReads);
|
||||
WriteUi(viewModel.DataWrites);
|
||||
UrnUi(viewModel.DataUrns);
|
||||
ServoUi(viewModel.DataServos);
|
||||
|
||||
//展示限制
|
||||
viewModel.IsVisRead = viewModel.DataReads.Any();
|
||||
viewModel.IsVisWrite = viewModel.DataWrites.Any();
|
||||
viewModel.IsVisUrn = viewModel.DataUrns.Any();
|
||||
viewModel.IsVisServo = viewModel.DataServos.Any();
|
||||
|
||||
Task.Run(viewModel.WhileRead);
|
||||
}
|
||||
|
||||
private void vis(object sender, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (IsInDesignMode)
|
||||
return;
|
||||
|
||||
viewModel.IsVis = (bool)e.NewValue;
|
||||
}
|
||||
|
||||
#region 渲染页面
|
||||
void ReadUi(IEnumerable<DeviceReadModel> data)
|
||||
{
|
||||
stackPanel1.Children.Clear();
|
||||
if (data == null || !data.Any())
|
||||
return;
|
||||
|
||||
var moren = data.Where(o => string.IsNullOrWhiteSpace(o.ExcelTag.组名));
|
||||
var group = data.Where(o => !string.IsNullOrWhiteSpace(o.ExcelTag.组名)).GroupBy(o => o.ExcelTag.组名);
|
||||
|
||||
if (moren.Any())
|
||||
{
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item in moren)
|
||||
{
|
||||
item.Value = item.ExcelTag.类型.Trim().ToLower() == "bool" ? false : "-";
|
||||
item.IsExpanded = true;
|
||||
|
||||
IotStateInfo iotState = new IotStateInfo();
|
||||
iotState.DataContext = item;
|
||||
iotState.SetBinding(IotStateInfo.HeaderProperty, nameof(item.Name));
|
||||
iotState.SetBinding(IotStateInfo.ValueProperty, nameof(item.Value));
|
||||
iotState.SetBinding(IotStateInfo.PostfixProperty, $"{nameof(item.ExcelTag)}.{nameof(item.ExcelTag.单位)}");
|
||||
|
||||
wrapPanel.Children.Add(iotState);
|
||||
}
|
||||
stackPanel1.Children.Add(wrapPanel);
|
||||
}
|
||||
if (group.Any())
|
||||
{
|
||||
foreach (var item in group)
|
||||
{
|
||||
Expander expander = new Expander();
|
||||
expander.Header = item.Key;
|
||||
expander.Tag = item;
|
||||
expander.Expanded += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceReadModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
}
|
||||
};
|
||||
expander.Collapsed += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceReadModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = false;
|
||||
}
|
||||
};
|
||||
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item2 in item)
|
||||
{
|
||||
item2.Value = item2.ExcelTag.类型.Trim().ToLower() == "bool" ? false : "-";
|
||||
|
||||
IotStateInfo iotState = new IotStateInfo();
|
||||
iotState.DataContext = item2;
|
||||
iotState.SetBinding(IotStateInfo.HeaderProperty, nameof(item2.Name));
|
||||
iotState.SetBinding(IotStateInfo.ValueProperty, nameof(item2.Value));
|
||||
iotState.SetBinding(IotStateInfo.PostfixProperty, $"{nameof(item2.ExcelTag)}.{nameof(item2.ExcelTag.单位)}");
|
||||
|
||||
wrapPanel.Children.Add(iotState);
|
||||
}
|
||||
expander.Content = wrapPanel;
|
||||
stackPanel1.Children.Add(expander);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void WriteUi(IEnumerable<DeviceWriteModel> data)
|
||||
{
|
||||
if (true)
|
||||
{
|
||||
stackPanel2.Children.Clear();
|
||||
if (data == null || !data.Any())
|
||||
return;
|
||||
|
||||
var moren = data.Where(o => string.IsNullOrWhiteSpace(o.ExcelTag.组名));
|
||||
var group = data.Where(o => !string.IsNullOrWhiteSpace(o.ExcelTag.组名)).GroupBy(o => o.ExcelTag.组名);
|
||||
|
||||
if (moren.Any())
|
||||
{
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item in moren)
|
||||
{
|
||||
item.Value = item.ExcelTag.类型.Trim().ToLower() == "bool" ? false : "-";
|
||||
item.IsExpanded = true;
|
||||
|
||||
IotStateInfo iotState = new IotStateInfo();
|
||||
iotState.DataContext = item;
|
||||
iotState.Click += viewModel.WriteClick;
|
||||
iotState.PreviewMouseLeftButtonDown += viewModel.LeftDown;
|
||||
iotState.PreviewMouseLeftButtonUp += viewModel.LeftUp;
|
||||
iotState.SetBinding(IotStateInfo.HeaderProperty, nameof(item.Name));
|
||||
iotState.SetBinding(IotStateInfo.ValueProperty, nameof(item.Value));
|
||||
iotState.SetBinding(IotStateInfo.PostfixProperty, $"{nameof(item.ExcelTag)}.{nameof(item.ExcelTag.单位)}");
|
||||
|
||||
wrapPanel.Children.Add(iotState);
|
||||
}
|
||||
stackPanel2.Children.Add(wrapPanel);
|
||||
}
|
||||
if (group.Any())
|
||||
{
|
||||
foreach (var item in group)
|
||||
{
|
||||
Expander expander = new Expander();
|
||||
expander.Header = item.Key;
|
||||
expander.Tag = item;
|
||||
expander.Expanded += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceWriteModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
}
|
||||
};
|
||||
expander.Collapsed += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceWriteModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = false;
|
||||
}
|
||||
};
|
||||
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item2 in item)
|
||||
{
|
||||
item2.Value = item2.ExcelTag.类型.Trim().ToLower() == "bool" ? false : "-";
|
||||
|
||||
IotStateInfo iotState = new IotStateInfo();
|
||||
iotState.DataContext = item2;
|
||||
iotState.Click += viewModel.WriteClick;
|
||||
iotState.PreviewMouseLeftButtonDown += viewModel.LeftDown;
|
||||
iotState.PreviewMouseLeftButtonUp += viewModel.LeftUp;
|
||||
iotState.SetBinding(IotStateInfo.HeaderProperty, nameof(item2.Name));
|
||||
iotState.SetBinding(IotStateInfo.ValueProperty, nameof(item2.Value));
|
||||
iotState.SetBinding(IotStateInfo.PostfixProperty, $"{nameof(item2.ExcelTag)}.{nameof(item2.ExcelTag.单位)}");
|
||||
|
||||
wrapPanel.Children.Add(iotState);
|
||||
}
|
||||
expander.Content = wrapPanel;
|
||||
stackPanel2.Children.Add(expander);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void UrnUi(IEnumerable<DeviceUrnModel> data)
|
||||
{
|
||||
if (true)
|
||||
{
|
||||
stackPanel3.Children.Clear();
|
||||
if (data == null || !data.Any())
|
||||
return;
|
||||
|
||||
var moren = data.Where(o => string.IsNullOrWhiteSpace(o.ExcelTag.组名));
|
||||
var group = data.Where(o => !string.IsNullOrWhiteSpace(o.ExcelTag.组名)).GroupBy(o => o.ExcelTag.组名);
|
||||
|
||||
if (moren.Any())
|
||||
{
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item in moren)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
|
||||
IotUrnMode iotUrn = new IotUrnMode();
|
||||
iotUrn.DataContext = item;
|
||||
iotUrn.SetBinding(IotUrnMode.TextProperty, nameof(item.Name));
|
||||
iotUrn.SetBinding(IotUrnMode.IsButBadge1Property, nameof(item.IsGoTo));
|
||||
iotUrn.SetBinding(IotUrnMode.IsButBadge2Property, nameof(item.IsRetTo));
|
||||
iotUrn.Button1.Click += viewModel.Button1_Click;
|
||||
iotUrn.Button1.PreviewMouseLeftButtonDown += viewModel.But1ClickDown;
|
||||
iotUrn.Button1.PreviewMouseLeftButtonUp += viewModel.But1ClickUp;
|
||||
iotUrn.Button2.Click += viewModel.Button2_Click;
|
||||
iotUrn.Button2.PreviewMouseLeftButtonDown += viewModel.But2ClickDown;
|
||||
iotUrn.Button2.PreviewMouseLeftButtonUp += viewModel.But2ClickUp;
|
||||
|
||||
wrapPanel.Children.Add(iotUrn);
|
||||
}
|
||||
stackPanel3.Children.Add(wrapPanel);
|
||||
}
|
||||
if (group.Any())
|
||||
{
|
||||
foreach (var item in group)
|
||||
{
|
||||
Expander expander = new Expander();
|
||||
expander.Header = item.Key;
|
||||
expander.Tag = item;
|
||||
expander.Expanded += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceUrnModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
}
|
||||
};
|
||||
expander.Collapsed += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceUrnModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = false;
|
||||
}
|
||||
};
|
||||
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item2 in item)
|
||||
{
|
||||
IotUrnMode iotUrn = new IotUrnMode();
|
||||
iotUrn.DataContext = item2;
|
||||
iotUrn.SetBinding(IotUrnMode.TextProperty, nameof(item2.Name));
|
||||
iotUrn.SetBinding(IotUrnMode.IsButBadge1Property, nameof(item2.IsGoTo));
|
||||
iotUrn.SetBinding(IotUrnMode.IsButBadge2Property, nameof(item2.IsRetTo));
|
||||
iotUrn.Button1.Click += viewModel.Button1_Click;
|
||||
iotUrn.Button1.PreviewMouseLeftButtonDown += viewModel.But1ClickDown;
|
||||
iotUrn.Button1.PreviewMouseLeftButtonUp += viewModel.But1ClickUp;
|
||||
iotUrn.Button2.Click += viewModel.Button2_Click;
|
||||
iotUrn.Button2.PreviewMouseLeftButtonDown += viewModel.But2ClickDown;
|
||||
iotUrn.Button2.PreviewMouseLeftButtonUp += viewModel.But2ClickUp;
|
||||
|
||||
wrapPanel.Children.Add(iotUrn);
|
||||
}
|
||||
expander.Content = wrapPanel;
|
||||
stackPanel3.Children.Add(expander);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ServoUi(IEnumerable<DeviceServoModel> data)
|
||||
{
|
||||
if (true)
|
||||
{
|
||||
stackPanel4.Children.Clear();
|
||||
if (data == null || !data.Any())
|
||||
return;
|
||||
|
||||
var moren = data.Where(o => string.IsNullOrWhiteSpace(o.ExcelTag.组名));
|
||||
var group = data.Where(o => !string.IsNullOrWhiteSpace(o.ExcelTag.组名)).GroupBy(o => o.ExcelTag.组名);
|
||||
|
||||
if (moren.Any())
|
||||
{
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item in moren)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
|
||||
IotServoMode iotServo = new IotServoMode();
|
||||
iotServo.DataContext = item;
|
||||
iotServo.SetBinding(IotServoMode.TextProperty, nameof(item.Name));
|
||||
iotServo.SetBinding(IotServoMode.Speed1Property, nameof(item.JogSpeed));
|
||||
iotServo.SetBinding(IotServoMode.Speed2Property, nameof(item.AutoSpeed));
|
||||
iotServo.SetBinding(IotServoMode.LocationProperty, nameof(item.Location));
|
||||
iotServo.SetBinding(IotServoMode.IsVis1Property, new Binding(nameof(item.IsJog)) { Mode = BindingMode.TwoWay });
|
||||
iotServo.SetBinding(IotServoMode.IsFoldProperty, new Binding(nameof(item.IsFold)) { Mode = BindingMode.TwoWay });
|
||||
iotServo.LocationChange += viewModel.LocationChange;
|
||||
iotServo.SpeedChange += viewModel.SpeedChange;
|
||||
|
||||
wrapPanel.Children.Add(iotServo);
|
||||
}
|
||||
stackPanel4.Children.Add(wrapPanel);
|
||||
}
|
||||
if (group.Any())
|
||||
{
|
||||
foreach (var item in group)
|
||||
{
|
||||
Expander expander = new Expander();
|
||||
expander.Header = item.Key;
|
||||
expander.Tag = item;
|
||||
expander.Expanded += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceServoModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = true;
|
||||
}
|
||||
};
|
||||
expander.Collapsed += (s, e) =>
|
||||
{
|
||||
var c = (IGrouping<string, DeviceServoModel>)((Expander)s).Tag;
|
||||
foreach (var item in c)
|
||||
{
|
||||
item.IsExpanded = false;
|
||||
}
|
||||
};
|
||||
|
||||
WrapPanel wrapPanel = new WrapPanel();
|
||||
foreach (var item2 in item)
|
||||
{
|
||||
IotServoMode iotServo = new IotServoMode();
|
||||
iotServo.DataContext = item2;
|
||||
iotServo.SetBinding(IotServoMode.TextProperty, nameof(item2.Name));
|
||||
iotServo.SetBinding(IotServoMode.Speed1Property, nameof(item2.JogSpeed));
|
||||
iotServo.SetBinding(IotServoMode.Speed2Property, nameof(item2.AutoSpeed));
|
||||
iotServo.SetBinding(IotServoMode.LocationProperty, nameof(item2.Location));
|
||||
iotServo.SetBinding(IotServoMode.IsVis1Property, new Binding(nameof(item2.IsJog)) { Mode = BindingMode.TwoWay });
|
||||
iotServo.SetBinding(IotServoMode.IsFoldProperty, new Binding(nameof(item2.IsFold)) { Mode = BindingMode.TwoWay });
|
||||
iotServo.LocationChange += viewModel.LocationChange;
|
||||
iotServo.SpeedChange += viewModel.SpeedChange;
|
||||
|
||||
wrapPanel.Children.Add(iotServo);
|
||||
}
|
||||
expander.Content = wrapPanel;
|
||||
stackPanel4.Children.Add(expander);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -267,11 +267,6 @@
|
||||
<View:DeviceView Margin="0,5"/>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
<TabItem Header="扫码枪">
|
||||
<hc:TransitioningContentControl TransitionMode="Fade">
|
||||
<pi:TextBoxScanner Style="{StaticResource TextBoxExtend.Multi}" hc:InfoElement.Placeholder="鼠标点击此处激活" hc:InfoElement.Title="码信息" hc:InfoElement.TitlePlacement="Top" AutoClear="NextClear" IsAutoFocus="True"></pi:TextBoxScanner>
|
||||
</hc:TransitioningContentControl>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</TabItem>
|
||||
|
||||
|
||||
@ -61,26 +61,20 @@
|
||||
<RowDefinition Height="0.8*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<DataGrid Grid.Row="1"
|
||||
<DataGrid
|
||||
Grid.Row="1"
|
||||
SelectedItem="{Binding SelectedataGridItem}"
|
||||
Name="dataGrid"
|
||||
ItemsSource="{Binding DataGridItemSource}"
|
||||
SelectionChanged="dataGrid_SelectionChanged"
|
||||
RowHeight="39"
|
||||
AutoGenerateColumns="False" FontSize="13">
|
||||
<DataGrid.ContextMenu>
|
||||
<ContextMenu Name="dgmenu1" StaysOpen="true">
|
||||
<MenuItem Header="查询当前标定值/电压值" Click="MenuItem_Click"/>
|
||||
</ContextMenu>
|
||||
</DataGrid.ContextMenu>
|
||||
<DataGrid.Columns>
|
||||
<!--<DataGridTemplateColumn CanUserResize="False">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<CheckBox Width="30" Height="30" IsHitTestVisible="False" IsChecked="{Binding IsSelected}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
<DataGridTemplateColumn.HeaderTemplate>
|
||||
<DataTemplate>
|
||||
<CheckBox Width="30" Height="30" Unchecked="allChecked_Unchecked" Checked="allChecked_Checked" Name="allChecked"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.HeaderTemplate>
|
||||
</DataGridTemplateColumn>-->
|
||||
<DataGridTextColumn IsReadOnly="True" Header="序号" Binding="{Binding RowNumber}"></DataGridTextColumn>
|
||||
<DataGridTextColumn IsReadOnly="True" Header="货架编码" Binding="{Binding ShelfCode}"></DataGridTextColumn>
|
||||
<DataGridTextColumn IsReadOnly="True" Header="模组编码" Binding="{Binding ModuleCode}"></DataGridTextColumn>
|
||||
|
||||
@ -86,5 +86,14 @@ namespace 货架标准上位机
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
private void MenuItem_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//先获取选中的模组
|
||||
var module = viewModel.SelectedataGridItem;
|
||||
#region 调用接口 发送指令获取
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -94,7 +94,7 @@
|
||||
<ComboBox ItemsSource="{Binding LogTimeData}" SelectedValue="{Binding SaveLogDay}" SelectedValuePath="Key" DisplayMemberPath="Value" hc:InfoElement.Placeholder="日志缓存保存时间" hc:InfoElement.Title=""/>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
<GroupBox Header="其他列子" Margin="5" Padding="5" Style="{StaticResource GroupBoxTab}" Background="{x:Null}">
|
||||
<!--<GroupBox Header="其他列子" Margin="5" Padding="5" Style="{StaticResource GroupBoxTab}" Background="{x:Null}">
|
||||
<StackPanel>
|
||||
<TextBlock>文本框</TextBlock>
|
||||
<TextBox hc:InfoElement.Placeholder="请输入值" hc:InfoElement.Title="" hc:InfoElement.TitlePlacement="Left"></TextBox>
|
||||
@ -110,7 +110,7 @@
|
||||
<TextBox hc:InfoElement.Placeholder="请输入值" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="-" Margin="-5,5,0,5"></TextBox>
|
||||
</UniformGrid>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
</GroupBox>-->
|
||||
</hc:WaterfallPanel>
|
||||
</hc:ScrollViewer>
|
||||
<Button Grid.Row="1" Margin="3" Content="保存" FontSize="16" Height="36" Padding="0" hc:IconElement.Geometry="{StaticResource SaveGeometry}" hc:IconElement.Height="16" Command="{Binding SaveCommand}" Style="{StaticResource ButtonPrimary}" HorizontalAlignment="Stretch"/>
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
//连接不上加：SslMode=none;
|
||||
"MySql": "server=localhost;Database=db1;Uid=root;Pwd=123456;Convert Zero Datetime=True",
|
||||
//货架服务器的IP和端口号
|
||||
"ApiIpHost": "http://127.0.0.1:8888/",
|
||||
"ApiIpHost": "http://192.168.9.183:8888/",
|
||||
//WebSocket的地址
|
||||
"WebSocketUrl": "ws://127.0.0.1:7789/ws",
|
||||
"WebSocketUrl": "ws://192.168.9.183:7789/ws",
|
||||
//货架分区
|
||||
"GroupName": [ "C0"],
|
||||
//设备类型 可以配置为每个电脑不一样
|
||||
|
||||
Reference in New Issue
Block a user