客户要求的更改

This commit is contained in:
2026-05-15 17:17:08 +08:00
parent add4308b91
commit 7dabeddde4
23 changed files with 248 additions and 102 deletions

View File

@@ -281,8 +281,10 @@ namespace FATrace.OEMApp
/// <param name="Code"></param>
private void PLCDataService_ScanCodeEventHandler(object? sender, string Code)
{
//解析Code条码数据内包条码数据
CurParsedCodeInfo = NVRCom.ParseCodeFull(Code);
// 解析条码数据OEMApp 属于流程后段,现场可能存在历史 6 段条码,因此这里必须兼容 6/7 段格式)
// 新(7段)RawCode,Batch,SolidBeveBatch,Weight,ShelfLife,Region,DayCount
// 旧(6段)RawCode,Batch,Weight,ShelfLife,Region,DayCount
CurParsedCodeInfo = NVRCom.ParseCodeFullCompat(Code);
BeginInvoke(new Action(() =>
{
@@ -1213,7 +1215,8 @@ namespace FATrace.OEMApp
if (!string.IsNullOrWhiteSpace(e.Data))
{
//解析Code条码数据内包条码数据
CurParsedCodeInfo = NVRCom.ParseCodeFull(e.Data!.Trim());
// OEMApp 属于流程后段:兼容历史 6 段条码(详见 PLCDataService_ScanCodeEventHandler 注释)
CurParsedCodeInfo = NVRCom.ParseCodeFullCompat(e.Data!.Trim());
BeginInvoke(new Action(() =>
{