From d291af0ea6fbda27a326d19a6a51d99c1cedff59 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 八月 2024 15:49:05 +0800
Subject: [PATCH] 直接调拨核对模块，扫源单方法增加私有云模式时通过WEBAPI重新同步单据功能；领料出库核对模块，扫物料条码调用方法修改，增加系统参数判断，安瑞先解析条码；新增设备维修记录报表调用方法
---
WorkM/WorkM.csproj | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index ff9d4eb..fe5b10d 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -81,6 +81,9 @@
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
+ <Reference Include="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
+ <HintPath>..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -106,6 +109,24 @@
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\JIT_GetPPBomInfo.designer.cs">
<DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.designer.cs">
+ <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.designer.cs">
+ <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.designer.cs">
+ <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.cs">
<SubType>Form</SubType>
@@ -161,6 +182,18 @@
<Compile Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.Designer.cs">
<DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
</Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.designer.cs">
+ <DependentUpon>MES_TOBEReceived.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.designer.cs">
+ <DependentUpon>MES_WORKINProcess.cs</DependentUpon>
+ </Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.cs">
<SubType>Form</SubType>
</Compile>
@@ -190,6 +223,30 @@
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\EAM_SourceRuningStatus.designer.cs">
<DependentUpon>EAM_SourceRuningStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.designer.cs">
+ <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.Designer.cs">
+ <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.Designer.cs">
+ <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.Designer.cs">
+ <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.cs">
<SubType>Form</SubType>
@@ -382,6 +439,12 @@
</Compile>
<Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBill.designer.cs">
<DependentUpon>MES_StationOutBill.cs</DependentUpon>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.designer.cs">
+ <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon>
</Compile>
<Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_BaoFei.cs">
<SubType>Form</SubType>
@@ -863,6 +926,18 @@
<DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.resx">
+ <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.resx">
+ <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.resx">
+ <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.resx">
<DependentUpon>Mes_ProductionLinePackagingList.cs</DependentUpon>
</EmbeddedResource>
@@ -897,6 +972,14 @@
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.resx">
<DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.resx">
+ <DependentUpon>MES_TOBEReceived.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.resx">
+ <DependentUpon>MES_WORKINProcess.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.resx">
<DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -915,6 +998,18 @@
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\EAM_SourceRuningStatus.resx">
<DependentUpon>EAM_SourceRuningStatus.cs</DependentUpon>
<SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.resx">
+ <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.resx">
+ <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.resx">
+ <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.resx">
+ <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.resx">
<DependentUpon>WMS_BarCodeBackInfoReport.cs</DependentUpon>
@@ -1043,6 +1138,10 @@
</EmbeddedResource>
<EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBill.resx">
<DependentUpon>MES_StationOutBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.resx">
+ <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_BaoFei.resx">
@@ -1348,7 +1447,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
--
Gitblit v1.9.1