From 5f170975b04d15bc421895303fa100fc0ee7a73d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 30 十二月 2025 08:06:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index ea6762a..6ceda4b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -272,6 +272,7 @@
<Content Include="DLL\BLL.dll" />
<Content Include="DLL\DAL.dll" />
<Content Include="DLL\DBUtility.dll" />
+ <Content Include="DLL\Interop.grsvr6Lib.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
<Content Include="DLL\Model.dll" />
<Content Include="DLL\Newtonsoft.Json.Net35.dll" />
@@ -287,7 +288,6 @@
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
<Content Include="Template\barCodeTemplateStorage.json" />
- <None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
<None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -429,6 +429,7 @@
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_OrderTransportBillListController.cs" />
<Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
@@ -668,10 +669,12 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
+ <Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />
+ <Compile Include="DLL\ClsQC_RequestCheckBill.cs" />
<Compile Include="Models\ClsGy_Billorigin.cs" />
<Compile Include="Models\ClsSc_MESStopRestoreWorkBillMain.cs" />
<Compile Include="Models\ClsSc_MESStopRestoreWorkBillSub.cs" />
@@ -936,6 +939,8 @@
<Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
+ <Compile Include="Models\ClsQC_RequestCheckBillMain.cs" />
+ <Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
<Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
<Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
--
Gitblit v1.9.1