From de7dbe7cf85aa01abb64040aae1c04dfba74c135 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 01 4月 2025 10:48:50 +0800
Subject: [PATCH] 优化 和plc交互问题
---
CC/iWareCC_ASRS/iWareCC.csproj | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index 3b9ef2f..21bf0fa 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -12,6 +12,8 @@
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
+ <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
+ <TargetFrameworkProfile />
<PublishUrl>D:\Pub\CC\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -27,8 +29,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -103,11 +103,17 @@
<Compile Include="BLL\ConveyorBLL.cs" />
<Compile Include="BLL\SrmBLL.cs" />
<Compile Include="BLL\RgvBLL.cs" />
+ <Compile Include="Common\Helper\PlcHelper.cs" />
<Compile Include="Common\Helper\WmsRequestHelper.cs" />
<Compile Include="Common\Helper\AgvRequestHelper.cs" />
<Compile Include="Common\Helper\FormHelper.cs" />
<Compile Include="Common\Helper\MyExtendHelper.cs" />
<Compile Include="Common\MyMesService.cs" />
+ <Compile Include="Connected Services\PrintBaseService\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </Compile>
<Compile Include="Connected Services\StationService\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -136,6 +142,12 @@
<Compile Include="FormCC.Designer.cs">
<DependentUpon>FormCC.cs</DependentUpon>
</Compile>
+ <Compile Include="Forms\FormManagerPassword.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Forms\FormManagerPassword.Designer.cs">
+ <DependentUpon>FormManagerPassword.cs</DependentUpon>
+ </Compile>
<Compile Include="Forms\SrmStockForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -148,6 +160,8 @@
<Compile Include="Forms\SystemCheckForm.Designer.cs">
<DependentUpon>SystemCheckForm.cs</DependentUpon>
</Compile>
+ <Compile Include="Handler\DeviceWarningHandler.cs" />
+ <Compile Include="Handler\WmsRecordUpiProcessHandler.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DeviceThreadFactory\DeviceThreadService\RgvThreadService\RgvTaskThreadService.cs" />
@@ -156,27 +170,33 @@
<Compile Include="ThreadService\00_269宸ヤ綅\DataProcess_269.cs" />
<Compile Include="ThreadService\01_BZ01宸ヤ綅锛堟竻鐏帮紝娲楁澘鍚庡伐浣嶏級\DataProcess_BZ01.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡DataProcess_RobotBuffer_ModeChange.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Inbound\2銆丏ataProcess_BZ39_IssueInboundTask.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\2銆丏ataProcess_RobotBuffer_IssueOutboundTask - 澶嶅埗.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\3銆丏ataProcess_RobotBuffer_FinishTaskForOutbound - 澶嶅埗.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\5銆丏ataProcess_RobotBuffer_PesonOutbound.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\4銆丏ataProcess_RobotBuffer_ForceOutbound.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\CC_DataProcess_RobotBuffer_ForceOutbound.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\2銆丏ataProcess_RobotBuffer_IssueOutboundTask.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\1銆丏ataProcess_RobotBuffer_AutoQiTaoOutbound.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\3銆丏ataProcess_RobotBuffer_FinishTaskForOutbound.cs" />
- <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Inbound\2銆丏ataProcess_RobotBuffer_FinishTask.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Inbound\3銆丏ataProcess_RobotBuffer_FinishTask.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Inbound\1銆丏ataProcess_BZ39.cs" />
- <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_BZ21.cs" />
+ <Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\2銆丏ataProcess_BZ12_IssueTask.cs" />
+ <Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\1銆丏ataProcess_BZ12.cs" />
+ <Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\3銆丏ataProcess_BZ12_FinishTask.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡2銆丏ataProcess_BZ21_IssueTask.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡1銆丏ataProcess_BZ21.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡3銆丏ataProcess_BZ21_FinishTask.cs" />
+ <Compile Include="ThreadService\05_BZ30%28榻愬楠岃瘉%29\DataProcess_ValidateQiTao.cs" />
<Compile Include="WCF\CCWcfService.cs" />
<Compile Include="WCF\ICCWcfService.cs" />
- <Compile Include="WmsTask\AutoUpdateEngineInfoTask.cs" />
- <Compile Include="WmsTask\AutoSalverMaterialBindTask.cs" />
- <Compile Include="WmsTask\LineInSacnResult.cs" />
- <Compile Include="WmsTask\MainTaskDecompose_ZPRK.cs" />
- <Compile Include="WmsTask\VirtualTaskNoOutPlanTaskHandler.cs" />
- <Compile Include="WmsTask\OutTaskRetryToMes.cs" />
- <Compile Include="WmsTask\Place1014To1020Task.cs" />
- <Compile Include="WmsTask\EmptySalverTransferTask.cs" />
- <Compile Include="WmsTask\OutPlanTaskDecompose.cs" />
- <Compile Include="WmsTask\MainTaskDecompose.cs" />
+ <Compile Include="WmsTask\PushPaperCutToMes.cs" />
+ <Compile Include="WmsTask\PushPackageCodeToMes.cs" />
<EmbeddedResource Include="FormCC.resx">
<DependentUpon>FormCC.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Forms\FormManagerPassword.resx">
+ <DependentUpon>FormManagerPassword.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\SrmStockForm.resx">
<DependentUpon>SrmStockForm.cs</DependentUpon>
@@ -200,6 +220,31 @@
<None Include="App - 姝ｅ紡.config">
<SubType>Designer</SubType>
</None>
+ <None Include="Connected Services\PrintBaseService\item.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\item1.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\item2.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.GetImageResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.Print2Response.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.Print3Response.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.PrintResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\PrintWcfService.wsdl" />
<None Include="Connected Services\RgvService\iWareCC.RgvService.RgvView.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
@@ -241,9 +286,6 @@
<None Include="Connected Services\SrmService\service.xsd">
<SubType>Designer</SubType>
</None>
- <None Include="Connected Services\StationService\item.xsd">
- <SubType>Designer</SubType>
- </None>
<None Include="Connected Services\StationService\item1.xsd">
<SubType>Designer</SubType>
</None>
@@ -255,6 +297,9 @@
</None>
<None Include="Connected Services\StationService\item4.xsd">
<SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\StationService\iWareCC.StationService.DeviceWarningInfo.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\StationService\iWareCC.StationService.SdaResEntity.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
@@ -282,6 +327,7 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
+ <WCFMetadataStorage Include="Connected Services\PrintBaseService\" />
<WCFMetadataStorage Include="Connected Services\RgvService\" />
<WCFMetadataStorage Include="Connected Services\SrmService\" />
<WCFMetadataStorage Include="Connected Services\StationService\" />
@@ -349,13 +395,18 @@
<Generator>WCF Proxy Generator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
+ <None Include="Connected Services\PrintBaseService\item.disco" />
+ <None Include="Connected Services\PrintBaseService\configuration91.svcinfo" />
+ <None Include="Connected Services\PrintBaseService\configuration.svcinfo" />
+ <None Include="Connected Services\PrintBaseService\Reference.svcmap">
+ <Generator>WCF Proxy Generator</Generator>
+ <LastGenOutput>Reference.cs</LastGenOutput>
+ </None>
<Content Include="IwareICO.ico" />
<Content Include="Logo.ico" />
<None Include="Resources\绌挎姣嶈溅1.jpg" />
<None Include="Resources\绌挎瀛愭瘝杞�%28褰╄壊%29.jpg" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.3