合并分支

chenhaozhe

17 小时以前 6d85c65004990ac29f58ad233eba3a795c2f818b

 WebAPI/WebAPI.csproj

@@ -84,6 +84,15 @@
    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
    </Reference>
    <Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
    </Reference>
    <Reference Include="GetuiServerApiSDK">
      <HintPath>DLL\GetuiServerApiSDK.dll</HintPath>
    </Reference>
    <Reference Include="Google.ProtocolBuffers">
      <HintPath>DLL\Google.ProtocolBuffers.dll</HintPath>
    </Reference>
    <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
      <HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath>
    </Reference>
@@ -467,6 +476,7 @@
    <Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
    <Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
    <Compile Include="Controllers\QC_InStockCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -476,6 +486,7 @@
    <Compile Include="Controllers\SCGL\日计划管理\JIT_DayPlanPlatFormBill_TKController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\Xs_SendGoodsPlanBillController.cs" />
    <Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
    <Compile Include="Controllers\Sc_EmployeeSignInNoteBillController.cs" />
    <Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -670,6 +681,8 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_PNLInfoTypeLevelController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_ShelfLifeNearExpiryController.cs" />
    <Compile Include="Controllers\检验申请单\QC_RequestCheckBillController.cs" />
    <Compile Include="Controllers\物流管理\出运单\WLYayBillController.cs" />
    <Compile Include="Controllers\物流管理\运单费用结算单\Pay_WayBillPaymentBillController.cs" />
    <Compile Include="Controllers\项目管理\工程项目\PM_ProjectBill_WorkController.cs" />
    <Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
    <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
@@ -1180,6 +1193,7 @@
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
      <DependentUpon>Settings.settings</DependentUpon>
    </Compile>
    <Compile Include="Service\GeTuiService.cs" />
    <Compile Include="Service\LuBaoSevice.cs" />
    <Compile Include="Service\ProcessDal.cs" />
    <Compile Include="Service\YqnDal.cs" />
@@ -1220,6 +1234,7 @@
      <DependentUpon>Reference.map</DependentUpon>
    </Compile>
    <Compile Include="WebServer.cs" />
    <Compile Include="Service\WebSocketServer.cs" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="packages.config">