From ffb5fa50d9a02ff3efbd3044d3cee6a5285471a8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 七月 2021 16:14:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3fa8e81..68265bd 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -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,13 @@
<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\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -400,6 +401,7 @@
<Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
<Compile Include="DLL\ClsSc_ICMOReportBill.cs" />
<Compile Include="DLL\ClsSc_MESBeginWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESEndWorkBill.cs" />
@@ -420,12 +422,22 @@
<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" />
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillSub.cs" />
<Compile Include="Models\ClsSc_MouldScrapOutBillMain.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
--
Gitblit v1.9.1