From be14322d1b20857082dd47aeb895bd976dca13e0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 17:40:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/iWareCC.csproj | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index 07fb8dd..4f7ae2e 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -108,6 +108,11 @@
<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>
@@ -156,6 +161,7 @@
<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\4銆丏ataProcess_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" />
@@ -164,17 +170,16 @@
<Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\DataProcess_BZ12.cs" />
<Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\DataProcess_BZ12_FinishTask.cs" />
<Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_BZ21.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_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\PrintHandler.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" />
<EmbeddedResource Include="FormCC.resx">
<DependentUpon>FormCC.cs</DependentUpon>
@@ -201,6 +206,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>
@@ -283,6 +313,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\" />
@@ -350,6 +381,13 @@
<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" />
--
Gitblit v1.9.3