From c87cf9a415a98d71b83f6a00a9c6e9cd8bc18b8d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 28 十二月 2021 20:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6b102c6..f3592b7 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>
@@ -173,10 +173,6 @@
       <HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WebAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\WebAPI.dll</HintPath>
-    </Reference>
     <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
       <Private>True</Private>
@@ -283,7 +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\Pay_PeriodInfoSetController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -323,6 +318,7 @@
     <Compile Include="Controllers\BLL\Xt_UserController.cs" />
     <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
     <Compile Include="Controllers\CellWidthController.cs" />
+    <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
     <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
     <Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
     <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
@@ -338,6 +334,7 @@
     <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
     <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+    <Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
@@ -351,10 +348,12 @@
     <Compile Include="Controllers\MoveStockBillController.cs" />
     <Compile Include="Controllers\Open_PrintTemController.cs" />
     <Compile Include="Controllers\ReportStepPlatFormController.cs" />
+    <Compile Include="Controllers\SCGL\Sc_PackUnionBillController.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" />
@@ -433,6 +432,7 @@
     <Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
     <Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
     <Compile Include="DLL\ClsKf_MateOutBill.cs" />
+    <Compile Include="DLL\ClsKf_SellOutBackBill.cs" />
     <Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" />
     <Compile Include="DLL\ClsOA_InformBill.cs" />
     <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
@@ -714,7 +714,9 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Cg_PurchaseReturn\" />
     <Folder Include="Views\Gy_EquipType\" />
+    <Folder Include="Views\Kf_ICStockBillMain\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />
@@ -781,6 +783,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