From fcc6bf3f4e0d50b0c7a6e66c8c4abe672d8be495 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期一, 13 九月 2021 15:07:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3f8d9e7..3229e98 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -355,6 +355,7 @@
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
@@ -387,6 +388,7 @@
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="LogService.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
@@ -396,6 +398,7 @@
<Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
+ <Compile Include="Models\Xt_ORGANIZATIONS.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
<Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
@@ -462,6 +465,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
--
Gitblit v1.9.1