From 6dee5ec23bd7b7d35e7820dd71d7a7ebe70fc69f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 02 八月 2021 11:57:09 +0800
Subject: [PATCH] 合并
---
WebAPI/WebAPI.csproj | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0b3f1a7..d45af89 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -299,10 +299,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <None Include="Web References\WebS\Reference.map">
+ <Content Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </None>
+ </Content>
<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,11 +387,14 @@
<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_FirstPieceCheckBillController.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" />
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -421,6 +423,7 @@
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
+ <Compile Include="Models\ClsGy_Material_Model.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
<Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />
--
Gitblit v1.9.1