From 918f9175edd2d64cb0f9fb459f987e3cbee3ea38 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 27 五月 2024 13:40:43 +0800
Subject: [PATCH] 1、销售出库维护页面:删除功能报错 2.网页端删除报错,如果是条码生成的应该在删除界面提示这张销售出库是条码生成,请去PDA缓存列表删除,如果是下推产生,应该可以直接删除。
---
WarM/WarM.csproj | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index e7c4f64..622dce6 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -74,6 +74,7 @@
<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>
@@ -94,6 +95,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Management" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -693,11 +695,17 @@
<Compile Include="鏉$爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
- <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC.cs">
+ <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC.designer.cs">
- <DependentUpon>Gy_BarCodeBill_automaticallyByPLC.cs</DependentUpon>
+ <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>
@@ -1144,10 +1152,13 @@
<EmbeddedResource Include="鏉$爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC.resx">
- <DependentUpon>Gy_BarCodeBill_automaticallyByPLC.cs</DependentUpon>
+ <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>
--
Gitblit v1.9.1