From 95cd9faab13b3c5447a8ae3d658de7296de5fc52 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 25 六月 2025 13:42:17 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/AuxAllWCS.csproj | 7 +++++--
2025年6月12日/AuxAllWCS/Devices/PlcConfig | 10 +++++-----
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 8 +++++++-
2025年6月12日/AuxAllWCS/Devices/设备通信.json | 2 +-
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj"
index 01af573..02f27ab 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj"
@@ -2,11 +2,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<PropertyGroup>
<Platform Condition="'$(Configuration)' == ''">AnyCPU</Platform>
- <OutputType>WinExe</OutputType>
+ <OutputType>Exe</OutputType>
<RootNamespace>GZ.Projects.AuxAllWCS</RootNamespace>
<AssemblyName>AuxAllWCS</AssemblyName>
<TargetFrameworkVersion>4.6.1</TargetFrameworkVersion>
- <ProjectGuid>{8ec00415-f135-4f69-84fd-926694fa46f1}</ProjectGuid>
+ <ProjectGuid>{8EC00415-F135-4F69-84FD-926694FA46F1}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -27,6 +27,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <StartupObject />
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System">
<HintPath>..\..\Dlls\System.dll</HintPath>
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index bc07033..63c610a 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -908,7 +908,13 @@
taskActRepository.Update(item);
continue;
}
- //var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
+ var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
+ if (task == null)
+ {
+ item.N_CREATEMETHOD = -1;
+ taskActRepository.Update(item);
+ continue;
+ }
string loc = "";
if (tin < 2)
{
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
index 996109f..ac9cc3c 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
@@ -998,7 +998,7 @@
"DataValue": "",
"SetValue": "0",
"Address": "41203",
- "AddrType": "04",
+ "AddrType": "3",
"Length": 1,
"Desc": "",
"Trigger": true,
@@ -1015,7 +1015,7 @@
"DataValue": "",
"SetValue": "0",
"Address": "41204",
- "AddrType": "04",
+ "AddrType": "3",
"Length": 1,
"Desc": "",
"Trigger": true,
@@ -1219,7 +1219,7 @@
"DataValue": "",
"SetValue": "0",
"Address": "41203",
- "AddrType": "04",
+ "AddrType": "3",
"Length": 1,
"Desc": "",
"Trigger": true,
@@ -1236,7 +1236,7 @@
"DataValue": "",
"SetValue": "0",
"Address": "41204",
- "AddrType": "04",
+ "AddrType": "3",
"Length": 1,
"Desc": "",
"Trigger": true,
@@ -6786,5 +6786,5 @@
}
],
"CreationTime": "2025-02-26 15:31:23",
- "LastWriteTime": "2025-06-25 10:38:08"
+ "LastWriteTime": "2025-06-25 13:02:29"
}
\ No newline at end of file
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
index 9c36162..2428abe 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
@@ -2,5 +2,5 @@
"ProjectSn": "1",
"DeviceList": [],
"CreationTime": "2025-02-26 15:31:23",
- "LastWriteTime": "2025-06-25 10:38:08"
+ "LastWriteTime": "2025-06-25 13:02:29"
}
\ No newline at end of file
--
Gitblit v1.9.1