From 243e86af1a7c74c8bfda3bb41f29a11fef13c065 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 09 十月 2024 16:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4fdaf7e..6aa1e71 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -132,6 +132,7 @@
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
+ <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
@@ -436,6 +437,13 @@
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
<Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
+ <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
+ <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
<Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
@@ -590,6 +598,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
@@ -706,6 +715,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" />
@@ -715,6 +725,7 @@
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />
<Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
@@ -782,10 +793,14 @@
<Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
+ <Compile Include="DLL\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Ctl.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<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="Exceptions\EmptyException.cs" />
+ <Compile Include="Exceptions\ExcelException.cs" />
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
@@ -802,6 +817,8 @@
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
+ <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
+ <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
@@ -1025,6 +1042,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 +1122,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\" />
@@ -1240,6 +1260,10 @@
<Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
</ProjectReference>
+ <ProjectReference Include="..\SyntacticSugar\SyntacticSugar.csproj">
+ <Project>{AFD44036-A391-4A68-BD73-37BABFC1605E}</Project>
+ <Name>SyntacticSugar</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="http://192.168.0.81/WEBS-WMS/WebService1.asmx">
--
Gitblit v1.9.1