From 166ad531bfd4c5744d98d2176ac52d9c7bd2e54d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 15 四月 2022 13:37:42 +0800
Subject: [PATCH] 出站汇报单汇报前，根据不同客户，对录入总工时与标准总工时进行对比判断；基础资料生产资源DAL模块中返回信息公用标准方法恢复
---
PlanM/PlanM.csproj | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 69140c6..0a55294 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.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>
@@ -182,6 +189,12 @@
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
</Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.Designer.cs">
+ <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+ </Compile>
<Compile Include="璁″垝绠＄悊\Gy_ICBomBill.cs">
<SubType>Form</SubType>
</Compile>
@@ -208,22 +221,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>
@@ -294,6 +291,9 @@
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
+ <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="璁″垝绠＄悊\Gy_ICBomBill.resx">
<DependentUpon>Gy_ICBomBill.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1