From 33253e48c0f67a177cb0e41459b2a2785b49c5aa Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 31 十月 2024 10:27:48 +0800
Subject: [PATCH] 工艺路线：调用h_p_Gy_RoutingBillCheck存储过程的地方加一个参数
---
WarM/WarM.csproj | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 153 insertions(+), 20 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 49b98f6..0bdfff6 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WarM</RootNamespace>
<AssemblyName>WarM</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -41,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -65,8 +68,17 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</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="Microsoft.VisualBasic" />
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -87,6 +99,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Management" />
+ <Reference Include="System.Printing" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -115,6 +129,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>
@@ -374,6 +400,12 @@
<Compile Include="浠撳簱绠＄悊\Kf_StockInRequestBillList.designer.cs">
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.designer.cs">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ </Compile>
<Compile Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.cs">
<SubType>Form</SubType>
</Compile>
@@ -542,6 +574,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 +700,66 @@
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs">
+ <DependentUpon>Gy_PackBarCodeBill_automaticallyByPLC.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="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode.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 +780,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 +801,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>
@@ -892,6 +981,10 @@
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.resx">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.resx">
<DependentUpon>CH_OtherStockInCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -910,9 +1003,6 @@
</EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_RedStockOutCheckCount.resx">
<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">
@@ -1008,6 +1098,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 +1181,45 @@
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
+ <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.resx">
+ <DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.resx">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.resx">
+ <DependentUpon>Gy_PackBarCodeBill_automaticallyByPLC.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.resx">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.resx">
+ <DependentUpon>Kf_WeighToBarCode.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