From 31311530412d9039bcd4096fb1d729d2f0265122 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 十二月 2025 15:10:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index abcc13e..b8b6acb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -376,6 +376,7 @@
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DriverController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
@@ -451,6 +452,8 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdBackBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOutRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
@@ -626,10 +629,12 @@
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DiscountListController.cs" />
@@ -654,7 +659,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MultipleCode_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
+ <Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />
<Compile Include="Models\ClsGy_Billorigin.cs" />
@@ -664,6 +671,7 @@
<Compile Include="Models\ClsWW_EntrustOrderBillMainSub.cs" />
<Compile Include="Models\ClsWW_PPBomBill.cs" />
<Compile Include="Models\ClsWW_EntrustOrderBillMain_1.cs" />
+ <Compile Include="Models\Driver.cs" />
<Compile Include="Models\GroupOrderBill.cs" />
<Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
@@ -973,6 +981,7 @@
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_CarType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
@@ -1239,6 +1248,7 @@
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
+ <Folder Include="Views\Gy_Driver\" />
<Folder Include="Views\Gy_DutyBill\" />
<Folder Include="Views\Gy_EquipStatus\" />
<Folder Include="Views\Gy_EquipType\" />
--
Gitblit v1.9.1