Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2021-12-25 9385f2a2e4e2b6578f4b9e1cc139db977c2467ee

 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,8 +346,11 @@
    <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" />
@@ -369,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" />
@@ -386,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" />
@@ -460,9 +460,12 @@
    <Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
    <Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
    <Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
    <Compile Include="Models\ClsSc_ProcessReportMain.cs" />
    <Compile Include="Models\ClsSc_ProcessReportSub.cs" />
    <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" />
@@ -774,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>