From dfd0831df7b8245b7af6b6be28efd18b29fab17d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 19 一月 2022 18:02:51 +0800
Subject: [PATCH] 条码拆码+工时单+器具权限

---
 WarM/WarM.csproj |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 49b98f6..0c637da 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,12 @@
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</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 +555,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 +681,12 @@
     <Compile Include="鏉$爜鎵撳嵃\Frm_Split.Designer.cs">
       <DependentUpon>Frm_Split.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 +707,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 +728,9 @@
     <EmbeddedResource Include="Kf_BillDatePeriod.resx">
       <DependentUpon>Kf_BillDatePeriod.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>
@@ -1008,6 +1020,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 +1103,10 @@
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Frm_Split.resx">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </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