From 77841dec99bfba72112a66a17dfc69f9aff35f6a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 27 十二月 2021 19:21:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 57772f3..f84ccdb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -32,7 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -279,8 +279,6 @@
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
-    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
-    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
     <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -348,12 +346,16 @@
     <Compile Include="Controllers\MoveStockBillController.cs" />
     <Compile Include="Controllers\Open_PrintTemController.cs" />
     <Compile Include="Controllers\ReportStepPlatFormController.cs" />
+    <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
     <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
     <Compile Include="Controllers\PurchaseOrderController.cs" />
     <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_GroupEmpBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
@@ -368,7 +370,7 @@
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESTransFerWorkBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
-    <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
+    <Compile Include="Controllers\Sc_MouldRepairInBillListController.cs" />
     <Compile Include="Controllers\Sc_MouldController.cs" />
     <Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
     <Compile Include="Controllers\QC_ManagementController.cs" />
@@ -385,7 +387,6 @@
     <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
-    <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
     <Compile Include="Controllers\LMESController.cs" />
     <Compile Include="Controllers\LookingForBillController.cs" />
@@ -452,6 +453,7 @@
     <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
     <Compile Include="DLL\ClsSc_PackUnionBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+    <Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
@@ -463,6 +465,7 @@
     <Compile Include="Models\GetWeekList.cs" />
     <Compile Include="Models\jsonScanline.cs" />
     <Compile Include="Models\ScanLineCode.cs" />
+    <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillSub.cs" />
@@ -506,7 +509,9 @@
     <Compile Include="Models\ClsOA_InformBillSub.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillMain.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillSub.cs" />
+    <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListMain.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+    <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListSub.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillSub.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
@@ -772,6 +777,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>

--
Gitblit v1.9.1