From c6fd827a11eda1dcb747b2f48113e074ad13cbf2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/iWareCC.csproj | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index b64345c..c71096e 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>iWareCC</RootNamespace>
<AssemblyName>iWareCC</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
@@ -28,6 +28,7 @@
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
<WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -92,6 +93,9 @@
<Reference Include="WZ.Useful.Commons">
<HintPath>..\iWareCommon\DLL\WZ.Useful.Commons.dll</HintPath>
</Reference>
+ <Reference Include="Yitter.IdGenerator.Net45">
+ <HintPath>..\DLL\Yitter.IdGenerator.Net45.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BLL\SalverMaterialBindBLL.cs" />
@@ -104,6 +108,11 @@
<Compile Include="Common\Helper\FormHelper.cs" />
<Compile Include="Common\Helper\MyExtendHelper.cs" />
<Compile Include="Common\MyMesService.cs" />
+ <Compile Include="Connected Services\StationService\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </Compile>
<Compile Include="DeviceThreadFactory\DeviceThreadServiceFactory.cs" />
<Compile Include="DeviceThreadFactory\DeviceThreadServiceHandle.cs" />
<Compile Include="Common\Helper\ControlHelper.cs" />
@@ -144,11 +153,18 @@
<Compile Include="DeviceThreadFactory\DeviceThreadService\RgvThreadService\RgvTaskThreadService.cs" />
<Compile Include="DeviceThreadFactory\DeviceThreadService\ConveyorThreadService\ConveyorThreadService.cs" />
<Compile Include="DeviceThreadFactory\DeviceThreadService\SrmThreadService\SrmTaskThreadService.cs" />
+ <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宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡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\1銆丏ataProcess_BZ39.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_BZ21.cs" />
<Compile Include="WCF\CCWcfService.cs" />
<Compile Include="WCF\ICCWcfService.cs" />
<Compile Include="WmsTask\AutoUpdateEngineInfoTask.cs" />
- <Compile Include="WmsTask\AutoIssueInStoreTask.cs" />
- <Compile Include="WmsTask\AutoSalverMaterialBindTask - 澶嶅埗.cs" />
<Compile Include="WmsTask\AutoSalverMaterialBindTask.cs" />
<Compile Include="WmsTask\LineInSacnResult.cs" />
<Compile Include="WmsTask\MainTaskDecompose_ZPRK.cs" />
@@ -180,7 +196,7 @@
<None Include="App - 鏈満.config">
<SubType>Designer</SubType>
</None>
- <None Include="App - 鐜板満.config">
+ <None Include="App - 姝ｅ紡.config">
<SubType>Designer</SubType>
</None>
<None Include="Connected Services\RgvService\iWareCC.RgvService.RgvView.datasource">
@@ -224,6 +240,28 @@
<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>
+ <None Include="Connected Services\StationService\item2.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\StationService\item3.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\StationService\item4.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\StationService\iWareCC.StationService.SdaResEntity.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\StationService\iWareCC.StationService.StationView.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\StationService\StationService.wsdl" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -245,6 +283,7 @@
<ItemGroup>
<WCFMetadataStorage Include="Connected Services\RgvService\" />
<WCFMetadataStorage Include="Connected Services\SrmService\" />
+ <WCFMetadataStorage Include="Connected Services\StationService\" />
</ItemGroup>
<ItemGroup>
<None Include="Connected Services\SrmService\configuration91.svcinfo" />
@@ -302,11 +341,20 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="Connected Services\StationService\item.disco" />
+ <None Include="Connected Services\StationService\configuration91.svcinfo" />
+ <None Include="Connected Services\StationService\configuration.svcinfo" />
+ <None Include="Connected Services\StationService\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 />
+ <ItemGroup>
+ <Folder Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.3