From a999db77f1ce6f22e1369dff6df919104d9a956e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 八月 2024 10:19:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index de33dc0..2ac4c26 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -408,6 +408,7 @@
     <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
     <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
     <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+    <Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
     <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
     <Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />
     <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
@@ -516,6 +517,7 @@
     <Compile Include="Controllers\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillController.cs" />
     <Compile Include="Controllers\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillController.cs" />
     <Compile Include="Controllers\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillController.cs" />
+    <Compile Include="Controllers\浠撳瓨绠＄悊\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠＄悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
@@ -539,7 +541,9 @@
     <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckOtherBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillController.cs" />
+    <Compile Include="Controllers\鍝佽川绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_TakeSampleCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
+    <Compile Include="Controllers\CJGL\CJ_WIPBeginStockBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
@@ -574,6 +578,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_UnitConvertRateController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowProgressBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
@@ -686,6 +691,7 @@
     <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_MaintainLev_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_RestDay_Ctl.cs" />
     <Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
     <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />
@@ -749,6 +755,7 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
     <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
     <Compile Include="Models\ClsGy_MouldFileBillSub_MaintainRule.cs" />
     <Compile Include="Models\ClsGy_MateMould.cs" />

--
Gitblit v1.9.1