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

zgq

2021-07-21 6b3640b2e831df35d489327d8fc4b7baaf4ed996

 WebAPI/WebAPI.csproj

@@ -299,10 +299,10 @@
    <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </Content>
    <Content Include="Web References\WebS\Reference.map">
    <None Include="Web References\WebS\Reference.map">
      <Generator>MSDiscoCodeGenerator</Generator>
      <LastGenOutput>Reference.cs</LastGenOutput>
    </Content>
    </None>
    <None Include="Web References\WebS\WebService1.disco" />
    <Content Include="Web.config">
      <SubType>Designer</SubType>
@@ -374,7 +374,6 @@
    <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
    <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
    <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
    <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
    <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
    <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
    <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
@@ -388,6 +387,8 @@
    <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
    <Compile Include="Controllers\品质管理\工序检验单\QC_ProcessCheckBillController.cs" />
    <Compile Include="Controllers\品质管理\首件检验单\QC_FirstPieceCheckBillController.cs" />
    <Compile Include="Dapper\SqlHelper.cs" />
    <Compile Include="Dapper\SqlPools.cs" />
    <Compile Include="DbUntil\DataFormatUntil.cs" />
@@ -568,7 +569,6 @@
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\" />
    <Folder Include="Controllers\PZGL\" />
    <Folder Include="Views\MoveStockBill\" />
    <Folder Include="Views\QC_Management\" />
  </ItemGroup>