From e4662c9a134dfb7204016073060eaf3efd59abea Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 02 十一月 2024 16:43:53 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 76e11b3..4ae2332 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -361,6 +361,12 @@
     <Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
       <DependentUpon>UserSetPwd.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.Designer.cs">
+      <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Warehouse\Frm_MesDepot.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -390,8 +396,12 @@
     <Compile Include="DevFrm\Warehouse\Models\MesInvItemArn.cs" />
     <Compile Include="DevFrm\Warehouse\Models\MesInvItemArnDetail.cs" />
     <Compile Include="DevFrm\Warehouse\Models\MesInvItemBarcodes.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemInCDetails.cs" />
     <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" />
     <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" />
     <Compile Include="Entity\LoginInfoModel.cs" />
     <Compile Include="Entity\PageQueryModel.cs" />
     <Compile Include="Entity\ReturnModel.cs" />
@@ -591,6 +601,9 @@
     <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
       <DependentUpon>UserSetPwd.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_ArrivalBarcode.resx">
+      <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx">
       <DependentUpon>Frm_MesDepot.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3