From 695d9c4cda618bae357d6f70a068b604dac4fdd3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 23 十一月 2022 10:17:45 +0800
Subject: [PATCH] 合并

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

diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 7fb208d..a5f2ac3 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -123,6 +123,18 @@
       <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>
     </Compile>
@@ -549,6 +561,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 +687,18 @@
     <Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
       <DependentUpon>Frm_Split.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="鏉＄爜鎵撳嵃\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>
@@ -710,6 +740,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>
@@ -903,9 +940,6 @@
       <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">
       <DependentUpon>Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -999,6 +1033,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>
@@ -1078,6 +1116,14 @@
     <EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
+      <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </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