From 96617be8bf2a3ca47d62a459e72116c153d6cbaa Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 25 九月 2025 09:34:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3d276a..6e10138 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -281,6 +281,7 @@
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
+ <Content Include="Template\barCodeTemplateStorage.json" />
<None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -449,6 +450,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopRestoreWorkBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
@@ -638,7 +640,11 @@
<Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
+ <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />
<Compile Include="Models\ClsGy_Billorigin.cs" />
+ <Compile Include="Models\ClsSc_MESStopRestoreWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESStopRestoreWorkBillSub.cs" />
<Compile Include="Models\GroupOrderBill.cs" />
<Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
@@ -1273,6 +1279,7 @@
<Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
<Folder Include="Views\Sc_ComplementGoods\" />
<Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
+ <Folder Include="Views\Sc_MESStopRestoreWorkBill\" />
<Folder Include="Views\Sc_MouldDotCheckRuleBill\" />
<Folder Include="Views\Sc_MouldLifeUseBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
--
Gitblit v1.9.1