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 |   93 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 0ccfaea..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" />
@@ -122,6 +124,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>
@@ -381,6 +395,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>
@@ -549,6 +569,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>
@@ -669,6 +695,36 @@
     <Compile Include="鏉$爜鎵撳嵃\Frm_Split.Designer.cs">
       <DependentUpon>Frm_Split.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>
@@ -716,6 +772,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>
@@ -889,6 +952,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>
@@ -907,9 +974,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">
@@ -1005,6 +1069,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>
@@ -1084,6 +1152,25 @@
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Frm_Split.resx">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </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>

--
Gitblit v1.9.1