From 1b5293c8ca79ce81b0ce5de7f4a89cc96aee6cb3 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 16 十二月 2025 10:12:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a46bba9..ccc5081 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
@@ -624,6 +625,8 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\闃舵宸ヤ环绯绘暟\Gy_SteppedPriceCoefficientBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\闃舵宸ヤ环绯绘暟\Gy_SteppedPriceCoefficientBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_CusShouGongChaoBaoSumReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_CusShouGongChaoBaoReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_SellOutEntryReport_YP.html" />
@@ -937,6 +940,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateSNCode.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkSN.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
@@ -2690,6 +2694,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1