syc_zhangzhuo/seyounth.hyosung.ty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正代码

Browse Source
This commit is contained in:
anerx 2025-03-20 19:32:49 +08:00
parent 999fb457a4
commit ab2ae0969a
23 changed files with 109 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Seyounth.Core/Extensions/DateTimeExtensions.cs
View File

@ -2,8 +2,8 @@ namespace Seyounth.Core.Extensions;
public static class DateTimeExtensions
{
public static long ToTimestamp(this DateTime dateTime)
public static int ToTimestamp(this DateTime dateTime)
{
return new DateTimeOffset(dateTime).ToUnixTimeMilliseconds();
return (int)new DateTimeOffset(dateTime).ToUnixTimeSeconds();
}
}

2
Seyounth.Hyosung.Core/Agv/HyosungAgvService.cs
View File

@ -13,7 +13,7 @@ public class HyosungAgvService(
private readonly HikAgv _agv = new(loggerFactory.CreateLogger<HikAgv>());
public async Task StorageAsync(long trayCode)
public async Task StorageAsync(string trayCode)
{
AgvStatusInfo? status;
do

2
Seyounth.Hyosung.Core/Agv/IHyosungAgvService.cs
View File

@ -7,5 +7,5 @@ public interface IHyosungAgvService
/// </summary>
/// <param name="trayCode"></param>
/// <returns></returns>
Task StorageAsync(long trayCode);
Task StorageAsync(string trayCode);
}

51
Seyounth.Hyosung.Core/Plc/HyosungPlcService.cs
View File

@ -46,12 +46,12 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
logger.LogInformation($"write [{variety.Id}] to plc address[4230]");
}
public async Task WriteScanYarnResultAsync(bool result, short? varietyId = null, long yarnCode = 0)
public async Task WriteScanYarnResultAsync(bool result, short? varietyId = null, string? yarnCode= null )
{
if (result && yarnCode != null && varietyId != null)
{
await _writer.WriteShortsAsync(4009, varietyId.Value);
await _writer.WriteLongAsync(4010, yarnCode);
await _writer.WriteStringAsync(4010, yarnCode);
logger.LogInformation($"write [{yarnCode}] to plc address[4010]");
}
@ -81,10 +81,10 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
isLeaving = false;
}
public async Task WriteTrayCodeAsync(int index, long trayCode)
public async Task WriteTrayCodeAsync(int index, string trayCode)
{
var address = index == 1 ? 4100 : 4110;
await _writer.WriteLongAsync(address, trayCode);
await _writer.WriteStringAsync(address, trayCode);
}
public async Task WriteReceivedYarnCountAsync(int count)
@ -105,14 +105,25 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
await _writer.WriteShortsAsync(12120, ls.ToArray());
}
public async Task WritePrintLabelResultAsync(int index, bool result)
public async Task WritePrintLabelResultAsync(int index, int side, bool result)
{
var address = index == 1 ? 13060 : 13061;
if (index == 2)
await _writer.WriteShortsAsync(13053, 4);
{
var data = SetBit(0, side);
await _writer.WriteShortsAsync(13053, data);
}
await _writer.WriteShortsAsync(address, (short)(result ? 1 : 2));
}
static byte SetBit(byte value, int bitPosition)
{
// 创建一个掩码，该掩码只有第 bitPosition 位为 1
byte mask = (byte)(1 << bitPosition);
// 使用按位或操作将 value 的第 bitPosition 位置为 1
return (byte)(value | mask);
}
public event Func<int, Task>? OnPlcRequestScanProduct;
@ -124,9 +135,9 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
public event Func<PlcStackingInfo, Task>? OnPlcPutCompleted;
public event Func<long, Task>? OnPlcRequestPackLineOption;
public event Func<string, Task>? OnPlcRequestPackLineOption;
public event Func<int, long, int, Task>? OnRequestPrintLabel;
public event Func<int, string, int, Task>? OnRequestPrintLabel;
private async Task ReadLoop(CancellationToken token)
@ -205,8 +216,8 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
if (leavingProductionLine[0] == 1)
{
await _writer.WriteShortsAsync(4020, 0);
var trayCode = await _reader.ReadLongAsync(12600);
if (trayCode != 0)
var trayCode = await _reader.ReadStringAsync(12600);
if (!string.IsNullOrEmpty(trayCode))
{
PlcStackInfo info = new PlcStackInfo()
{
@ -244,21 +255,21 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
if (status[0] > 0)
{
await _writer.WriteShortsAsync(4690, 0, 0, 0);
var trayCode = await _reader.ReadLongAsync(4620);
var yarn1 = await _reader.ReadLongAsync(4630);
var yarn2 = await _reader.ReadLongAsync(4640);
var yarn3 = await _reader.ReadLongAsync(4650);
var trayCode = await _reader.ReadStringAsync(4620);
var yarn1 = await _reader.ReadStringAsync(4630);
var yarn2 = await _reader.ReadStringAsync(4640);
var yarn3 = await _reader.ReadStringAsync(4650);
var info = new PlcStackingInfo()
{
TrayCode = trayCode,
YarnCount = status[0],
TotalYarnCount = status[1]
};
if (yarn1!=0)
if (!string.IsNullOrEmpty(yarn1))
info.YarnCode.Add(yarn1);
if (yarn2!=0)
if (!string.IsNullOrEmpty(yarn2))
info.YarnCode.Add(yarn2);
if (yarn3!=0)
if (!string.IsNullOrEmpty(yarn3))
info.YarnCode.Add(yarn3);
if (info.YarnCode.Count != info.YarnCount)
{
@ -280,7 +291,7 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
var requestPackLineOption = await _reader.ReadShortsAsync(4022, 1);
if (requestPackLineOption[0] == 1)
{
var trayCode = await _reader.ReadLongAsync(12100);
var trayCode = await _reader.ReadStringAsync(12100);
await _writer.WriteShortsAsync(4022, 0);
OnPlcRequestPackLineOption?.Invoke(trayCode);
}
@ -291,7 +302,7 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
var requestPrintLabel = await _reader.ReadShortsAsync(13010, 3);
if (requestPrintLabel[0] == 1)
{
var trayCode = await _reader.ReadLongAsync(13000);
var trayCode = await _reader.ReadStringAsync(13000);
await _writer.WriteShortsAsync(13010, 0);
await _writer.WriteShortsAsync(13012, 0);
OnRequestPrintLabel?.Invoke(1, trayCode, requestPrintLabel[2]);
@ -299,7 +310,7 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
if (requestPrintLabel[1] == 1)
{
var trayCode = await _reader.ReadLongAsync(13000);
var trayCode = await _reader.ReadStringAsync(13000);
await _writer.WriteShortsAsync(13011, 0);
await _writer.WriteShortsAsync(13012, 0);
OnRequestPrintLabel?.Invoke(2, trayCode, requestPrintLabel[2]);

10
Seyounth.Hyosung.Core/Plc/IHyosungPlcService.cs
View File

@ -24,7 +24,7 @@ public interface IHyosungPlcService
/// <param name="varietyId">品类ID</param>
/// <param name="yarnCode">纱码</param>
/// <returns></returns>
Task WriteScanYarnResultAsync(bool result, short? varietyId = null, long yarnCode = 0);
Task WriteScanYarnResultAsync(bool result, short? varietyId = null, string? yarnCode = null);
/// <summary>
/// 写入治具扫码结果
@ -47,7 +47,7 @@ public interface IHyosungPlcService
/// <param name="index"></param>
/// <param name="trayCode"></param>
/// <returns></returns>
Task WriteTrayCodeAsync(int index, long trayCode);
Task WriteTrayCodeAsync(int index, string trayCode);
/// <summary>
/// 写入收到的纱数量
@ -58,7 +58,7 @@ public interface IHyosungPlcService
Task WritePackLineOptionAsync(PackLineOption option);
Task WritePrintLabelResultAsync(int index, bool result);
Task WritePrintLabelResultAsync(int index, int side, bool result);
/// <summary>
/// Plc请求扫描产品
@ -88,10 +88,10 @@ public interface IHyosungPlcService
/// <summary>
/// Plc请求打包线选项
/// </summary>
event Func<long, Task> OnPlcRequestPackLineOption;
event Func<string, Task> OnPlcRequestPackLineOption;
/// <summary>
/// 贴标站请求贴标
/// </summary>
event Func<int, long, int, Task> OnRequestPrintLabel;
event Func<int, string, int, Task> OnRequestPrintLabel;
}

21
Seyounth.Hyosung.Core/Plc/McPlc.cs
View File

@ -51,27 +51,6 @@ public class McPlc(string host, int port, Mitsubishi.McFrame type)
return shorts;
}
public async Task<long> ReadLongAsync(int address)
{
// 一个 long 类型是 8 字节，所以需要读取 8 个字节的数据
var bytes = await ReadBytesAsync(address, 8);
// 确保读取到了足够的字节
if (bytes.Length < 8)
{
throw new Exception("读取 long 类型数据时字节数不足");
}
// 将字节数组转换为 long 类型
return BitConverter.ToInt64(bytes, 0);
}
public async Task WriteLongAsync(int address, long value)
{
byte[] bytes = BitConverter.GetBytes(value);
// Write the byte array to the PLC
await WriteBytesAsync(address, bytes);
}
public async Task WriteShortsAsync(int address, params short[] values)
{
var code = await _mc.WriteDeviceBlock(Mitsubishi.PlcDeviceType.D, address, values.Length,

2
Seyounth.Hyosung.Core/Printer/HyosungPrinter.cs
View File

@ -34,7 +34,7 @@ public class HyosungPrinter(
logger.LogInformation("printer disconnected");
}
public async Task PrintAsync(int index, long trayCode)
public async Task PrintAsync(int index, string trayCode)
{
var tray = await trayService.GetByCode(trayCode);
if (index == 1)

2
Seyounth.Hyosung.Core/Printer/IHyosungPrinter.cs
View File

@ -11,5 +11,5 @@ public interface IHyosungPrinter
/// </summary>
/// <param name="trayCode"></param>
/// <returns></returns>
Task PrintAsync(int index,long trayCode);
Task PrintAsync(int index,string trayCode);
}

2
Seyounth.Hyosung.Data/Entities/AgvBinEntity.cs
View File

@ -31,4 +31,6 @@ public class AgvBinEntity
[SugarColumn(ColumnDescription = "排序")]
public int Sort { get; set; }
public bool IsDeleted { get; set; }
}

2
Seyounth.Hyosung.Data/Entities/ScannedYarnEntity.cs
View File

@ -12,7 +12,7 @@ public class ScannedYarnEntity
public string QrCode { get; set; }
[SugarColumn(ColumnDescription = "纱线代码", Length = 20)]
public long ScanCode { get; set; }
public string ScanCode { get; set; }
[SugarColumn(ColumnDescription = "Lot")]
public int Lot { get; set; }

2
Seyounth.Hyosung.Data/Entities/TrayEntity.cs
View File

@ -9,7 +9,7 @@ public class TrayEntity
public int Id { get; set; }
[SugarColumn(ColumnDescription = "托盘唯一号")]
public long TrayCode { get; set; }
public string TrayCode { get; set; }
[SugarColumn(ColumnDescription = "所属的品类信息")]
public int VarietyId { get; set; }

2
Seyounth.Hyosung.Data/Models/Plc/PackLineOption.cs
View File

@ -16,5 +16,5 @@ public partial class PackLineOption : ObservableObject
[ObservableProperty] private bool isLam;
[ObservableProperty] private long trayCode;
[ObservableProperty] private string trayCode;
}

2
Seyounth.Hyosung.Data/Models/Plc/PlcStackInfo.cs
View File

@ -5,6 +5,6 @@ namespace Seyounth.Hyosung.Data.Models.Plc;
/// </summary>
public class PlcStackInfo
{
public long TrayCode { get; set; }
public string TrayCode { get; set; }
}

4
Seyounth.Hyosung.Data/Models/Plc/PlcStackingInfo.cs
View File

@ -2,9 +2,9 @@ namespace Seyounth.Hyosung.Data.Models.Plc;
public class PlcStackingInfo
{
public long TrayCode { get; set; }
public string TrayCode { get; set; }
public List<long> YarnCode { get; set; } = new ();
public List<string> YarnCode { get; set; } = new List<string>();
public int YarnCount { get; set; }

2
Seyounth.Hyosung.Data/Models/Tray.cs
View File

@ -6,7 +6,7 @@ public class Tray
{
public int Id { get; set; }
public long TrayCode { get; set; }
public string TrayCode { get; set; }
public int VarietyId { get; set; }

6
Seyounth.Hyosung.Data/Models/Yarn.cs
View File

@ -9,7 +9,7 @@ public class Yarn
public string QrCode { get; set; }
public long ScanCode { get; set; }
public string ScanCode { get; set; }
public int Lot { get; set; }
@ -53,7 +53,7 @@ public class Yarn
ProduceTime = parts[3],
ScanTime = DateTime.Now,
VarietyId = varietyId,
ScanCode = DateTime.Now.ToTimestamp(),
ScanCode = DateTime.Now.ToTimestamp().ToString(),
TrayId = null
};
yarn.WorkShift = parts[1] switch
@ -79,7 +79,7 @@ public class Yarn
ScanTime = DateTime.Now,
VarietyId = varietyId,
TrayId = null,
ScanCode = DateTime.Now.ToTimestamp(),
ScanCode = DateTime.Now.ToTimestamp().ToString().PadLeft(10, '0'),
};
yarn.WorkShift = parts[5] switch
{

28
Seyounth.Hyosung.Data/Services/AgvBinService.cs
View File

@ -18,22 +18,24 @@ public class AgvBinService : IAgvBinService
public async Task<AgvBinEntity> GetAvailableBin(int height)
{
if (height < 180)
var bin = await _repository.AsQueryable()
.Where(x => x.IsFree && !x.IsDeleted).OrderBy(x => x.Sort).FirstAsync();
if (bin.BinCode == "B10")
{
return _cache
.Where(x =>
x is { CtnrType: 1, IsFree: true } ||
x is { CtnrType: 2, IsFree: true } &&
_cache.Any(y =>
y is { CtnrType: 1, IsFree: false } && y.BinCode == x.BinCode &&
y is { Height: < 180 })
)
.OrderByDescending(x => x.CtnrType)
.ThenBy(x => x.Sort)
.First();
await _repository.AsUpdateable()
.Where(x => x.RackType == 2 && !x.IsDeleted)
.SetColumns(x => x.IsFree, true)
.ExecuteCommandAsync();
}
else if (bin.BinCode == "B33")
{
await _repository.AsUpdateable()
.Where(x => x.RackType == 1 && !x.IsDeleted)
.SetColumns(x => x.IsFree, true)
.ExecuteCommandAsync();
}
return _cache.Where(a => a is { IsFree: true }).OrderBy(a => a.CtnrType).First();
return bin;
}
public Task BindAsync(AgvBinEntity entity)

8
Seyounth.Hyosung.Data/Services/ITrayService.cs
View File

@ -17,21 +17,21 @@ public interface ITrayService
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
Task<int> GetIdByCode(long code);
Task<int> GetIdByCode(string code);
/// <summary>
///
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
Task<Tray> GetByCode(long code);
Task<Tray> GetByCode(string code);
/// <summary>
/// 生成控制号
/// </summary>
/// <param name="trayCode"></param>
/// <returns></returns>
Task StorageAsync(long trayCode);
Task StorageAsync(string trayCode);
/// <summary>
/// 打印托盘
@ -41,5 +41,5 @@ public interface ITrayService
/// <param name="controlNo"></param>
/// <param name="itemInfo"></param>
/// <returns></returns>
Task PrintTrayAsync(long trayCode, int stackHeight, int controlNo, MST_ITEM_2240_V itemInfo);
Task PrintTrayAsync(string trayCode, int stackHeight, int controlNo, MST_ITEM_2240_V itemInfo);
}

8
Seyounth.Hyosung.Data/Services/IYarnService.cs
View File

@ -5,21 +5,21 @@ namespace Seyounth.Hyosung.Data.Services;
public interface IYarnService
{
ConcurrentDictionary<long, Yarn> NoFinished { get; }
ConcurrentDictionary<string, Yarn> NoFinished { get; }
Task<Yarn?> AddYarnAsync(Yarn yarn);
Task<List<Yarn>> GetYarnsByTrayIdAsync(int trayId);
Task<Yarn> GetYarnByCodeAsync(long code);
Task<Yarn> GetYarnByCodeAsync(string code);
/// <summary>
/// 完成指定纱
/// </summary>
/// <param name="yarnCode"></param>
/// <returns></returns>
Task FinishYarnAsync(long yarnCode);
Task FinishYarnAsync(string yarnCode);
/// <summary>
/// 绑定托盘号
@ -27,5 +27,5 @@ public interface IYarnService
/// <param name="yarnCode"></param>
/// <param name="trayId"></param>
/// <returns></returns>
Task BindTrayAsync(long yarnCode, int trayId);
Task BindTrayAsync(string yarnCode, int trayId);
}

19
Seyounth.Hyosung.Data/Services/TrayService.cs
View File

@ -11,7 +11,7 @@ namespace Seyounth.Hyosung.Data.Services;
public class TrayService : ITrayService
{
private readonly ConcurrentDictionary<long, Tray> _cache = new();
private readonly ConcurrentDictionary<string, Tray> _cache = new();
private readonly IRepository<TrayEntity> _repository;
private readonly IHyosungWmsService _hyosungWmsService;
@ -30,7 +30,7 @@ public class TrayService : ITrayService
{
var tray = new Tray()
{
TrayCode = DateTime.Now.ToTimestamp(),
TrayCode =DateTime.Now.ToTimestamp().ToString(),
VarietyId = varietyId,
CreateTime = DateTime.Now
};
@ -42,19 +42,21 @@ public class TrayService : ITrayService
return tray;
}
public async Task<int> GetIdByCode(long code)
public async Task<int> GetIdByCode(string code)
{
try
{
return _cache[code].Id;
}
catch
{
return (await _repository.GetFirstAsync(d => d.TrayCode == code)).Id;
}
}
public async Task<Tray> GetByCode(long code)
public async Task<Tray> GetByCode(string code)
{
return Tray.FromEntity(await _repository.GetSingleAsync(t => t.TrayCode == code));
}
@ -64,7 +66,7 @@ public class TrayService : ITrayService
throw new NotImplementedException();
}
public async Task PrintTrayAsync(long trayCode, int stackHeight, int controlNo, MST_ITEM_2240_V itemInfo)
public async Task PrintTrayAsync(string trayCode, int stackHeight, int controlNo, MST_ITEM_2240_V itemInfo)
{
Tray tray;
try
@ -89,11 +91,8 @@ public class TrayService : ITrayService
_cache.Remove(tray.TrayCode, out _);
}
public async Task StorageAsync(long trayCode)
public async Task StorageAsync(string trayCode)
{
var tray = await GetByCode(trayCode);
tray.FinishTime = DateTime.Now;
await _repository.UpdateAsync(tray.ToEntity());
_cache.Remove(tray.TrayCode, out _);
}
}

10
Seyounth.Hyosung.Data/Services/YarnService.cs
View File

@ -13,7 +13,7 @@ public class YarnService : IYarnService
public YarnService(IServiceProvider provider)
{
_yarnRepository = provider.CreateScope().ServiceProvider.GetRequiredService<IRepository<ScannedYarnEntity>>();
NoFinished = new ConcurrentDictionary<long, Yarn>();
NoFinished = new ConcurrentDictionary<string, Yarn>();
var yarns = _yarnRepository.GetList(y => !y.IsFinished);
foreach (var yarn in yarns)
{
@ -21,7 +21,7 @@ public class YarnService : IYarnService
}
}
public ConcurrentDictionary<long, Yarn> NoFinished { get; }
public ConcurrentDictionary<string, Yarn> NoFinished { get; }
public async Task<Yarn?> AddYarnAsync(Yarn yarn)
{
@ -37,7 +37,7 @@ public class YarnService : IYarnService
.Select(Yarn.FromEntity).ToList();
}
public async Task<Yarn> GetYarnByCodeAsync(long code)
public async Task<Yarn> GetYarnByCodeAsync(string code)
{
try
{
@ -50,7 +50,7 @@ public class YarnService : IYarnService
}
public async Task FinishYarnAsync(long yarnCode)
public async Task FinishYarnAsync(string yarnCode)
{
var yarn = NoFinished[yarnCode];
yarn.IsFinished = true;
@ -58,7 +58,7 @@ public class YarnService : IYarnService
NoFinished.TryRemove(yarnCode, out _);
}
public async Task BindTrayAsync(long yarnCode, int trayId)
public async Task BindTrayAsync(string yarnCode, int trayId)
{
var yarn = NoFinished[yarnCode];
yarn.TrayId = trayId;

14
Seyounth.Hyosung.Runtime/HyosungRuntime.cs
View File

@ -245,7 +245,7 @@ public class HyosungRuntime(
/// <param name="arg"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
private async Task OnPlcRequestPackLineOption(long arg)
private async Task OnPlcRequestPackLineOption(string arg)
{
logger.LogInformation($"plc request pack line option");
try
@ -286,12 +286,11 @@ public class HyosungRuntime(
/// <param name="arg2"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
private async Task OnPlcRequestPrintLabel(int arg1, long trayCode, int height)
private async Task OnPlcRequestPrintLabel(int arg1, string trayCode, int height)
{
logger.LogInformation($"plc request print label:{arg1} {trayCode} {height}");
try
{
var tray = await trayService.GetByCode(trayCode);
var variety = await varietyService.GetById(tray.VarietyId);
var mod = await hyosungWmsService.GetItemInfoByItemCode(variety.Code);
@ -301,19 +300,22 @@ public class HyosungRuntime(
await trayService.PrintTrayAsync(trayCode, height, controlNo, mod);
if (arg1 == 1)
{
await printer.PrintAsync(1, trayCode);
await hyosungPlcService.WritePrintLabelResultAsync(arg1, variety.SubLabelCount, true);
}
else
{
await printer.PrintAsync(2, trayCode);
await hyosungPlcService.WritePrintLabelResultAsync(arg1, variety.MasterLabelCount, true);
}
await hyosungPlcService.WritePrintLabelResultAsync(arg1, true);
await hyosungWmsService.UpdateControlNo(variety, controlNo);
logger.LogInformation($"plc request print label success");
}
catch (Exception e)
{
await hyosungPlcService.WritePrintLabelResultAsync(arg1, false);
await hyosungPlcService.WritePrintLabelResultAsync(arg1, 1,false);
logger.LogError(e, "print label fail");
}
}

2
Seyounth.Hyosung.Runtime/Models/StackStationModel.cs
View File

@ -9,7 +9,7 @@ namespace Seyounth.Hyosung.Runtime.Models;
public partial class StackStationModel
{
[ObservableProperty] [DefaultValue("NoData")]
private long trayCode;
private string trayCode;
[ObservableProperty] [DefaultValue("NoData")]
private string varietyCode;