From b1ecd60999b19a6e70f4934dc9240aba3da2236c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:17:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4fdaf7e..6e75247 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -436,6 +436,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\SCGL\Sc_ProductionReportsController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\Kf_MoveStockBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
     <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
@@ -706,6 +707,7 @@
     <Compile Include="Controllers\鐪嬫澘绠$悊\KB_CSGLController.cs" />
     <Compile Include="Controllers\鐪嬫澘绠$悊\Kf_XSFHController.cs" />
     <Compile Include="Controllers\椤圭洰绠$悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" />
+    <Compile Include="Controllers\PM_CustomerProInfoBillController.cs" />
     <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" />
     <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔鍛ㄨ鍒抃PM_WorkTaskWeekBillController.cs" />
     <Compile Include="Controllers\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" />
@@ -786,6 +788,7 @@
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsGy_GroupEmpBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_WorkTimesBill.cs" />
     <Compile Include="DLL\閽夐拤娑堟伅\Cls_DDMsg.cs" />
+    <Compile Include="DLL\椤圭洰绠$悊\椤圭洰闃舵\ClsPM_CustomerProInfoBill_Ctl.cs" />
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
@@ -1025,6 +1028,8 @@
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillMain.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_PurchaseWallclothBillSub.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillSub.cs" />
+    <Compile Include="Models\椤圭洰绠$悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillSub.cs" />
+    <Compile Include="Models\椤圭洰绠$悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillMain.cs" />
     <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -1103,6 +1108,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="bin\" />
+    <Folder Include="Controllers\椤圭洰绠$悊\鍩虹寤烘ā\" />
     <Folder Include="obj\x86\Debug\" />
     <Folder Include="Views\Cg_PODemandPlanBill\" />
     <Folder Include="Views\Cg_PurchaseReturn\" />

--
Gitblit v1.9.1