~yxj/MES-WEB-API.git

			@@ -67,6 +67,20 @@
			<ErrorReport>prompt</ErrorReport>
			</PropertyGroup>
			<ItemGroup>
			<Reference Include="AxInterop.grdes6Lib">
			<HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
			</Reference>
			<Reference Include="AxInterop.gregn6Lib">
			<HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
			</Reference>
			<Reference Include="Interop.grdes6Lib">
			<HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
			<EmbedInteropTypes>True</EmbedInteropTypes>
			</Reference>
			<Reference Include="Interop.gregn6Lib">
			<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
			<EmbedInteropTypes>True</EmbedInteropTypes>
			</Reference>
			<Reference Include="System" />
			<Reference Include="System.Data" />
			<Reference Include="System.Drawing" />
			@@ -80,6 +94,30 @@
			</Compile>
			<Compile Include="Form2.Designer.cs">
			<DependentUpon>Form2.cs</DependentUpon>
			</Compile>
			<Compile Include="报表分析\DefectiveDetailedYieldReport.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Include="报表分析\DefectiveDetailedYieldReport.designer.cs">
			<DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
			</Compile>
			<Compile Include="报表分析\JIT_GetPPBomInfo.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Include="报表分析\JIT_GetPPBomInfo.designer.cs">
			<DependentUpon>JIT_GetPPBomInfo.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>
			@@ -135,6 +173,24 @@
			<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>
			<Compile Include="报表分析\MES_WIPProcReport _WIP.designer.cs">
			<DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
			</Compile>
			<Compile Include="报表分析\Mes_WIPSumReportDateReport.cs">
			<SubType>Form</SubType>
			</Compile>
			@@ -152,6 +208,36 @@
			</Compile>
			<Compile Include="报表分析\ProductionOrder_ExecutionReport.designer.cs">
			<DependentUpon>ProductionOrder_ExecutionReport.cs</DependentUpon>
			</Compile>
			<Compile Include="报表分析\EAM_SourceRuningStatus.cs">
			<SubType>Form</SubType>
			</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>
			@@ -344,6 +430,30 @@
			</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>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList_BaoFei.designer.cs">
			<DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList_GeLi.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList_GeLi.designer.cs">
			<DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList_Bad.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList_Bad.designer.cs">
			<DependentUpon>MES_StationOutBillList_Bad.cs</DependentUpon>
			</Compile>
			<Compile Include="流转卡管理\MES_StationOutBillList.cs">
			<SubType>Form</SubType>
			@@ -785,38 +895,6 @@
			</Compile>
			</ItemGroup>
			<ItemGroup>
			<COMReference Include="Axgrdes6Lib">
			<Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
			<VersionMajor>6</VersionMajor>
			<VersionMinor>0</VersionMinor>
			<Lcid>0</Lcid>
			<WrapperTool>aximp</WrapperTool>
			<Isolated>False</Isolated>
			</COMReference>
			<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="grdes6Lib">
			<Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
			<VersionMajor>6</VersionMajor>
			<VersionMinor>0</VersionMinor>
			<Lcid>0</Lcid>
			<WrapperTool>tlbimp</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>
			@@ -830,6 +908,22 @@
			<EmbeddedResource Include="Form2.resx">
			<SubType>Designer</SubType>
			<DependentUpon>Form2.cs</DependentUpon>
			</EmbeddedResource>
			<EmbeddedResource Include="报表分析\DefectiveDetailedYieldReport.resx">
			<DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<EmbeddedResource Include="报表分析\JIT_GetPPBomInfo.resx">
			<DependentUpon>JIT_GetPPBomInfo.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>
			@@ -865,6 +959,18 @@
			<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>
			</EmbeddedResource>
			<EmbeddedResource Include="报表分析\Mes_WIPSumReportDateReport.resx">
			<DependentUpon>Mes_WIPSumReportDateReport.cs</DependentUpon>
			</EmbeddedResource>
			@@ -875,6 +981,22 @@
			<EmbeddedResource Include="报表分析\ProductionOrder_ExecutionReport.resx">
			<DependentUpon>ProductionOrder_ExecutionReport.cs</DependentUpon>
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<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>
			@@ -1005,6 +1127,22 @@
			<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">
			<DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<EmbeddedResource Include="流转卡管理\MES_StationOutBillList_GeLi.resx">
			<DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<EmbeddedResource Include="流转卡管理\MES_StationOutBillList_Bad.resx">
			<DependentUpon>MES_StationOutBillList_Bad.cs</DependentUpon>
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<EmbeddedResource Include="流转卡管理\MES_StationOutBillList.resx">
			<DependentUpon>MES_StationOutBillList.cs</DependentUpon>
			<SubType>Designer</SubType>