SoftwareGroup/602_WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化出站程序逻辑

Browse Source
This commit is contained in:
liming 蔡
2026-08-05 08:33:28 +08:00
parent 3afb9700d3
commit b3388967e4
3 changed files with 445 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -362,3 +362,4 @@ MigrationBackup/
FodyWeavers.xsd FodyWeavers.xsd
*.rar *.rar
/LargeSquareOne/App.config /LargeSquareOne/App.config
/JinYuan.Helper/JinYuan.Helper.csproj.user
JinYuan.ControlCenter/ControlCenter_Plc.cs
+5 -6
View File
@@ -1790,14 +1790,15 @@ namespace JinYuan.ControlCenters
private void BlankingStation(JYResult<byte[]> bArrays, object plcModel) private void BlankingStation(JYResult<byte[]> bArrays, object plcModel)
{ {
Group pf = plcModel as Group; Group pf = plcModel as Group;
if (bArrays == null) if (bArrays == null || !bArrays.IsSuccess || bArrays.Content == null)
{ {
CommonMethods.PlcLink.WriteInt16(pf.VarList[0].VarAddress, 0);//置位0 CommonMethods.PlcLink.WriteInt16(pf.VarList[0].VarAddress, 0);//置位0
CommonMethods.AddLog(false, $"电芯出站PLC有触发信号，但无数据!"); CommonMethods.AddLog(false, $"电芯出站PLC有触发信号，但无数据!");
LoggerHelp.WriteLog($"电芯出站PLC有触发信号，但无数据!", "SysErrorLog"); LoggerHelp.WriteLog($"电芯出站PLC有触发信号，但无数据!", "SysErrorLog");
return;
} }
if (bArrays.IsSuccess && bArrays.Content != null)
{
Random random = new Random(); Random random = new Random();
//解析数据 //解析数据
sw2.Restart(); sw2.Restart();
@@ -1819,6 +1820,7 @@ namespace JinYuan.ControlCenters
listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
#endregion
#region 上传MES #region 上传MES
//D3200起 //D3200起
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@@ -2271,7 +2273,6 @@ namespace JinYuan.ControlCenters
CommonMethods.AddDataMonitorLog(0, $"外观检测出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); CommonMethods.AddDataMonitorLog(0, $"外观检测出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
LoggerHelp.WriteInfo($"外观检测进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); LoggerHelp.WriteInfo($"外观检测进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
} }
}
/// <summary> /// <summary>
/// 电池结果判断 /// 电池结果判断
/// </summary> /// </summary>
@@ -2340,8 +2341,6 @@ namespace JinYuan.ControlCenters
} }
#endregion #endregion
#endregion
#region 创建空的数组List #region 创建空的数组List
public List<T> GetList<T>(int num, T data) public List<T> GetList<T>(int num, T data)
{ {
JinYuan.Helper/JinYuan.Helper.csproj.user
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>