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

修改了入库数据以及相关BUG

Browse Source
This commit is contained in:
zhangzhuo 2025-03-27 09:12:16 +08:00
parent d8c53f8bee
commit 872c678b10
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ public class HyosungPlcService(ILogger<HyosungPlcService> logger) : IHyosungPlcS
break; break;
} }
await _writer.WriteShortsAsync(13050, [1, 1, 1, masterCount]); await _writer.WriteShortsAsync(13050, [1, 1, 1, 2]);
} }
public async Task WritePrintLabelResultAsync(int index, bool result) public async Task WritePrintLabelResultAsync(int index, bool result)

6
Seyounth.Hyosung.Core/Printer/AveryPrinter.cs
View File

@ -49,7 +49,7 @@ public class AveryPrinter(string host, int port)
await ConnectAsync(CancellationToken.None); await ConnectAsync(CancellationToken.None);
} }
await _socket.SendAsync(Encoding.UTF8.GetBytes(context)); await _socket.SendAsync(Encoding.ASCII.GetBytes(context));
} }
private const string CleanCmd = "#!A1#!CA#!P1"; private const string CleanCmd = "#!A1#!CA#!P1";
@ -63,7 +63,7 @@ public class AveryPrinter(string host, int port)
await ConnectAsync(CancellationToken.None); await ConnectAsync(CancellationToken.None);
} }
await _socket.SendAsync(Encoding.UTF8.GetBytes(CleanCmd)); await _socket.SendAsync(Encoding.ASCII.GetBytes(CleanCmd));
} }
public async Task PrintAsync() public async Task PrintAsync()
@ -74,6 +74,6 @@ public class AveryPrinter(string host, int port)
await ConnectAsync(CancellationToken.None); await ConnectAsync(CancellationToken.None);
} }
await _socket.SendAsync(Encoding.UTF8.GetBytes(PrintCmd)); await _socket.SendAsync(Encoding.ASCII.GetBytes(PrintCmd));
} }
} }

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

@ -121,14 +121,14 @@ public class HyosungPrinter(
"250101J068", "250101J068",
$"\"{DateTime.Now.ToString("yyMMdd" + "J") + tray.ControlNo.ToString()?.PadLeft(3, '0')}\"" $"\"{DateTime.Now.ToString("yyMMdd" + "J") + tray.ControlNo.ToString()?.PadLeft(3, '0')}\""
}, },
{ "DTYY-JPA11530SFG250101000900115305480", $"\"{tray.Barcode}\"" } { "DTYY-JPA11530SFG250101000900115305480", $"{tray.Barcode}" }
}; };
string content = options.Value.DefaultTemp; string content = options.Value.DefaultTemp;
foreach (var (key, value) in dic) foreach (var (key, value) in dic)
{ {
content = content.Replace(key, value); content = content.Replace(key, value);
} }
logger.LogInformation($"print content: {content}");
return content; return content;
} }
} }

9
Seyounth.Hyosung.Data/Services/Hyosung/Entities/LabelResult.cs
View File

@ -25,9 +25,9 @@ public class LabelResult
// public string REMARKS { get; set; } = ""; // public string REMARKS { get; set; } = "";
// public string TRI_INTERFACE_YN { get; set; } = ""; // public string TRI_INTERFACE_YN { get; set; } = "";
public string TRI_TYPE { get; set; } = "zp10"; public string TRI_TYPE { get; set; } = "zp10";
//public string COMMON_S1 { get; set; } = ""; public string COMMON_S1 { get; set; } = "";
//public string COMMON_S2 { get; set; } = ""; public string COMMON_S2 { get; set; } = "";
//public string COMMON_S3 { get; set; } = ""; public string COMMON_S3 { get; set; } = "";
//public string COMMON_S4 { get; set; } = ""; //public string COMMON_S4 { get; set; } = "";
//public string COMMON_S5 { get; set; } = ""; //public string COMMON_S5 { get; set; } = "";
//public string COMMON_N1 { get; set; } = ""; //public string COMMON_N1 { get; set; } = "";
@ -48,9 +48,10 @@ public class LabelResult
GROSS_WEIGHT = (decimal)tray.GrossWeight; GROSS_WEIGHT = (decimal)tray.GrossWeight;
GRADE = tray.Grade ?? ""; GRADE = tray.Grade ?? "";
LOT = variety.Lot.ToString(); LOT = variety.Lot.ToString();
BOX_NO = tray.ControlNo?.ToString() ?? ""; BOX_NO = $"{DateTime.Now.ToString("yyMMdd" + "J") + tray.ControlNo.ToString()?.PadLeft(3, '0')}";
CREATED_BY = "seyounth"; CREATED_BY = "seyounth";
CREATED_ON = DateTime.Now.ToString("yyyy-MM-dd"); CREATED_ON = DateTime.Now.ToString("yyyy-MM-dd");
COMMON_S2 = variety.TotalCount.ToString();
} }
public LabelResult() public LabelResult()

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

@ -424,7 +424,7 @@ public class HyosungRuntime(
await hyosungPlcService.WritePrintLabelResultAsync(arg1, true); await hyosungPlcService.WritePrintLabelResultAsync(arg1, true);
// await varietyService.SetLastNo(variety.Id, tray.ControlNo.Value); // await varietyService.SetLastNo(variety.Id, tray.ControlNo.Value);
//await hyosungWmsService.UpdateControlNo(variety, tray.ControlNo.Value); //await hyosungWmsService.UpdateControlNo(variety, tray.ControlNo.Value);
await hyosungWmsService.AddLabelResult(new LabelResult(tray, variety)); // await hyosungWmsService.AddLabelResult(new LabelResult(tray, variety));
} }
logger.LogInformation($"plc request print label success"); logger.LogInformation($"plc request print label success");