From 695d9c4cda618bae357d6f70a068b604dac4fdd3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 23 十一月 2022 10:17:45 +0800
Subject: [PATCH] 合并
---
WarM/WarM.csproj | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 49b98f6..a5f2ac3 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -67,6 +67,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -115,6 +122,18 @@
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.designer.cs">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.Designer.cs">
+ <DependentUpon>Gy_BarCodeBill_ChaiMa.cs</DependentUpon>
</Compile>
<Compile Include="浠撳簱绠＄悊\Kf_EntrustInBill.cs">
<SubType>Form</SubType>
@@ -542,6 +561,12 @@
<Compile Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterOut_M.designer.cs">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
</Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.designer.cs">
+ <DependentUpon>WMS_BarCodeStatusQueryReport.cs</DependentUpon>
+ </Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeOutInReport.cs">
<SubType>Form</SubType>
</Compile>
@@ -662,6 +687,18 @@
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.designer.cs">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.designer.cs">
+ <DependentUpon>Sc_ICMOToBarCode.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBillList.cs">
<SubType>Form</SubType>
</Compile>
@@ -682,22 +719,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
@@ -719,6 +740,13 @@
<EmbeddedResource Include="Kf_BillDatePeriod.resx">
<DependentUpon>Kf_BillDatePeriod.cs</DependentUpon>
<SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_MESNowWorkBill_Fast.resx">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.resx">
+ <DependentUpon>Gy_BarCodeBill_ChaiMa.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="浠撳簱绠＄悊\Kf_EntrustInBill.resx">
<DependentUpon>Kf_EntrustInBill.cs</DependentUpon>
@@ -912,9 +940,6 @@
<DependentUpon>CH_RedStockOutCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo.resx">
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.resx">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -1008,6 +1033,10 @@
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.resx">
+ <DependentUpon>WMS_BarCodeStatusQueryReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeOutInReport.resx">
<DependentUpon>Kf_BarCodeOutInReport.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -1087,6 +1116,14 @@
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.resx">
+ <DependentUpon>Sc_ICMOToBarCode.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBillList.resx">
<DependentUpon>Gy_BarCodeBillList.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1