From 02c88bd8e4c77792cbe6184e7b39f645e3e1519a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 一月 2024 13:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a3696f3..17bdd52 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -509,6 +509,8 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" />
@@ -620,6 +622,12 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_SupType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_SellStyle_Ctl.cs" />
     <Compile Include="DLL\ClsGy_PostSkill_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockOutStyle_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockInStyle_Ctl.cs" />

--
Gitblit v1.9.1