SoftwareGroup/1440WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地址修改

Browse Source
This commit is contained in:
Administrator
2026-08-17 13:05:18 +08:00
parent 508647ecca
commit c06bb2704e
9 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JY.Inspection/HomeForm.cs
+14 -10
View File
@@ -2261,17 +2261,17 @@ namespace JY.Inspection
{
CollectionUtil.GetListUShort(ConstValue.CCD_SDict.Count),
CollectionUtil.GetListUShort(ConstValue.CCD_SDict.Count),
CollectionUtil.GetListUShort(ConstValue.CCD_SDict.Count)
//CollectionUtil.GetListUShort(ConstValue.CCD_SDict.Count)
},
ListCCDFResult = new List<List<float>> {
CollectionUtil.GetListFloat(ConstValue.CCD_FDict.Count),
CollectionUtil.GetListFloat(ConstValue.CCD_FDict.Count),
CollectionUtil.GetListFloat(ConstValue.CCD_FDict.Count)
//CollectionUtil.GetListFloat(ConstValue.CCD_FDict.Count)
},
ListCCDIResult = new List<List<int>> {
CollectionUtil.GetListInt(ConstValue.CCD_IDict.Count),
CollectionUtil.GetListInt(ConstValue.CCD_IDict.Count),
CollectionUtil.GetListInt(ConstValue.CCD_IDict.Count)
//CollectionUtil.GetListInt(ConstValue.CCD_IDict.Count)
},
ListResult = CollectionUtil.GetListUShort(2)
};
@@ -2285,6 +2285,10 @@ namespace JY.Inspection
var bytes = content.ByteReverse();
JY.Utility.LogHelper.LogPLCData("电池出站数据", bytes);
byte[] sByteArr = omronPLCCom.lstMcUI[0].Readbyte("W3400", 200)?.ByteReverse();
byte[] fByteArr = omronPLCCom.lstMcUI[0].Readbyte("W3500", 400)?.ByteReverse();
byte[] iByteArr = omronPLCCom.lstMcUI[0].Readbyte("W3600", 200)?.ByteReverse();
for (int i = 0; i < 2; i++)
{
// 出站条码: 偏移0, 每通道40字节(20字符)
@@ -2297,22 +2301,22 @@ namespace JY.Inspection
// OK/NG结果: 3400-3415, 每通道偏移100字节/3450-3465
for (int j = 0; j < ConstValue.CCD_SDict.Count; j++)
{
int index = 390 * 2 + (i * 50 * 2) + j * 2;
lstBarResult[j] = (short)TransformBase.TransInt16(content, index);
int index = (i * 50 * 2) + j * 2;
lstBarResult[j] = (short)TransformBase.TransInt16(sByteArr, index);
}
// 浮点型结果: 3500起/3550
for (int k = 0; k < ConstValue.CCD_FDict.Count; k++)
{
int index = 490 * 2 + (i * 50 * 2) + k * 2 * 2;
containers.ListCCDFResult[i][k] = TransformBase.TransSingle(content, index);
int index = (i * 50 * 2) + k * 2 * 2;
containers.ListCCDFResult[i][k] = TransformBase.TransSingle(fByteArr, index);
}
// 整型结果: 3600起/3650
for (int k = 0; k < ConstValue.CCD_IDict.Count; k++)
{
int index = 590 * 2 + (i * 50 * 2) + k * 2;
containers.ListCCDIResult[i][k] = TransformBase.TransInt16(content, index);
int index = (i * 50 * 2) + k * 2;
containers.ListCCDIResult[i][k] = TransformBase.TransInt16(iByteArr, index);
}
// 进站条码: 偏移280(140*2), 每通道40字节
@@ -2446,7 +2450,7 @@ namespace JY.Inspection
}
}
foreach (var propName in ConstValue.CCD_SDict.Keys)
foreach (var propName in ConstValue.CCD_IDict.Keys)
{
if (BlankingDataProps.TryGetValue(propName, out var prop))
{